Changeset 1419

Timestamp:

05/31/09 21:18:40 (10 months ago)

Author:

ajps

Message:

Fix for bug which caused some wrong "game commands" to be used in "stores", introduced with command changes in r1417.

Location:

trunk/src

Files:

• dungeon.c (modified) (2 diffs)
• game-cmd.c (modified) (2 diffs)
• game-cmd.h (modified) (1 diff)
• store.c (modified) (1 diff)

trunk/src/dungeon.c

@@ -1099 +1099 @@
 
                         /* Process the command */
-                        process_command(TRUE);
+                        process_command(CMD_GAME, TRUE);
 
                         /* Count this execution */
@@ -1122 +1122 @@
 
                         /* Get and process a command */
-                        process_command(FALSE);
+                        process_command(CMD_GAME, FALSE);
                 }
 

trunk/src/game-cmd.c

@@ -275 +275 @@
  * go along with it.
  */
-void process_command(bool no_request)
+void process_command(cmd_context ctx, bool no_request)
 {
         int i;
@@ -281 +281 @@
 
         /* If we've got a command to process, do it. */
-        if (cmd_get(CMD_GAME, &cmd, !no_request) == 0)
+        if (cmd_get(ctx, &cmd, !no_request) == 0)
         {
                 /* Obviously inefficient - can tune later if needed. */

trunk/src/game-cmd.h

@@ -165 +165 @@
 
 /* Called by the game engine to get the player's next action. */
-void process_command(bool no_request);
+void process_command(cmd_context c, bool no_request);
 
 #endif

trunk/src/store.c

@@ -2754 +2754 @@
 
         /* Let the game handle any core commands (equipping, etc) */
-        process_command(TRUE);
+        process_command(CMD_STORE, TRUE);
 
         if (redraw)