Changeset 589

Timestamp:

09/29/07 15:17:19 (1 year ago)

Author:

takkaria

Message:

Try to fix #319, where the autopickup behaviour seems strangely unpredictable. Fixed this by a global.

Files:

• trunk/src/cave.c (modified) (1 diff)
• trunk/src/cmd1.c (modified) (7 diffs)
• trunk/src/cmd2.c (modified) (6 diffs)
• trunk/src/dungeon.c (modified) (1 diff)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/pathfind.c (modified) (1 diff)
• trunk/src/types.h (modified) (1 diff)

trunk/src/cave.c

@@ -3908 +3908 @@
-        }
-
-        /* Cancel auto-pickup if badly wounded  XXX XXX */
-        if ((p_ptr->notice & (PN_PICKUP)) &&
-            (p_ptr->chp < (p_ptr->mhp * op_ptr->hitpoint_warn / 10)))
-        {
-                p_ptr->auto_pickup_okay = FALSE;
-        }
-
-        /* Flush the input if requested */
-        if (flush_disturb) flush();

trunk/src/cmd1.c

@@ -241 +241 @@
-static bool auto_pickup_okay(const object_type *o_ptr)
-{
+        /* Bad wounds prelude autopickup */
+        if (p_ptr->chp < (p_ptr->mhp * op_ptr->hitpoint_warn / 10)) return FALSE;
+
-        if (!inven_carry_okay(o_ptr)) return FALSE;
-
@@ -322 +325 @@
- * objects.  They are truly "unknown".
- */
-
+, bool pickup_okay
-{
-        int py = p_ptr->py;
@@ -344 +347 @@
-        bool msg = TRUE;
-
-        bool auto_okay = p_ptr->auto_pickup_okay;
-
-
-        /* Reset auto_pickup_okay */
-        p_ptr->auto_pickup_okay = TRUE;
-
-
-        /* Nothing to pick up -- return */
@@ -374 +371 @@
-
-                /* Automatically pick up items into the backpack */
-auto
+pickup
-                {
-                        /* Pick up the object with message */
@@ -532 +529 @@
-         * up.  Force the display of a menu in all cases.
-         */
-
+, pickup_okay
-
-        /* Indicate how many objects have been picked up. */
@@ -548 +545 @@
- * and also handles attempting to move into walls/doors/rubble/etc.
- */
-
+, bool pickup_okay
-{
-        int py = p_ptr->py;
@@ -711 +708 @@
-
-                        /* Handle objects now.  XXX */
-
+, pickup_okay
-                }
-

trunk/src/cmd2.c

@@ -2054 +2054 @@
- * Helper function for the "walk" command.
- */
-void do_cmd_walk(void
+static void walk(bool can_pickup
-{
-        int y, x, dir;
@@ -2100 +2100 @@
-
-        /* Move the player */
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -2106 +2114 @@
- * Jump into a trap, turn off pickup.
- *
-function
+concept
- */
-void do_cmd_jump(void)
-{
-        bool old_easy_alter;
-
-        /* Picking up NOT okay, so whatever you heard is obviously wrong */
-        p_ptr->auto_pickup_okay = FALSE;
-
-        /* easy_alter can be turned off (don't disarm traps) */
@@ -2119 +2124 @@
-        easy_alter = FALSE;
-
-Now actually do this silly walk
-do_cmd_walk(
+Walk without pickup
+walk(FALSE
-
-        /* Restore easy_alter */
@@ -2224 +2229 @@
-
-        /* Handle objects now.  XXX XXX XXX */
-
+, TRUE
-
-        /* Hack -- enter a store if we are on one */
@@ -2251 +2256 @@
-
-        /* Pick up floor objects, forcing a menu for multiple objects. */
-
+, TRUE
-
-        /* Maximum time expenditure is a full turn. */

trunk/src/dungeon.c

@@ -1272 +1272 @@
-                {
-                        /* Recursively call the pickup function, use energy */
-
+, TRUE
-                        p_ptr->notice &= ~(PN_PICKUP);
-                }

trunk/src/externs.h

@@ -300 +300 @@
-/* cmd1.c */
-extern void search(void);
-
-
+, bool pickup_okay
+, bool pickup
-
-/* cmd5.c */

trunk/src/pathfind.c

@@ -1102 +1102 @@
-
-        /* Move the player.  Never pick up objects */
-
-
+
-}
-

trunk/src/types.h

@@ -929 +929 @@
-        bool run_break_left;    /* Looking for a break (left) */
-
-        bool auto_pickup_okay;      /* Allow automatic pickup */
-
-        s16b command_cmd;               /* Gives identity of current command */
-        s16b command_arg;               /* Gives argument of current command */