Changeset 227

Timestamp:

06/27/07 21:25:25 (1 year ago)

Author:

takkaria

Message:

• Simplify the way item pickup is handled, in the hope this makes debugging easier
  
• Remove the now fairly pointless "jump" command
  
• Remove duplication of the pickup_inven option
  
• 
  

Files:

• trunk/src/cave.c (modified) (1 diff)
• trunk/src/cmd0.c (modified) (1 diff)
• trunk/src/cmd1.c (modified) (9 diffs)
• trunk/src/cmd2.c (modified) (5 diffs)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/dungeon.c (modified) (1 diff)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/types.h (modified) (1 diff)

trunk/src/cave.c

@@ -4142 +4142 @@
-
-        /* Cancel auto-pickup if badly wounded  XXX XXX */
-0 | PN_PICKUP1
+
-            (p_ptr->chp < (p_ptr->mhp * op_ptr->hitpoint_warn / 10)))
-        {

trunk/src/cmd0.c

@@ -155 +155 @@
-        { "Start running",            '.', do_cmd_run },
-        { "Stand still",              ',', do_cmd_hold },
-        { "Jump (into a trap)",       '-', do_cmd_jump },
-        { "Check knowledge",          '|', do_cmd_knowledge },
-        { "Display menu of actions", '\n', do_cmd_menu },

trunk/src/cmd1.c

@@ -491 +491 @@
-
-/*
-, and has "=g" in its inscription
+ automatically
- */
-static bool auto_pickup_okay(const object_type *o_ptr, bool check_pack)
@@ -530 +530 @@
-                        /* Find another '=' */
-                        s = strchr(s + 1, '=');
-                }
-        }
-
-        /* Optionally, check the backpack */
-        if (check_pack)
-        {
-                int j;
-
-                /* Look for similar and inscribed */
-                for (j = 0; j < INVEN_PACK; j++)
-                {
-                        object_type *j_ptr = &inventory[j];
-
-                        /* Skip non-objects */
-                        if (!j_ptr->k_idx) continue;
-
-                        /* The two items must be able to combine */
-                        if (!object_similar(j_ptr, o_ptr)) continue;
-
-                        /* The backpack item must be inscribed */
-                        if (!j_ptr->note) continue;
-
-                        /* Find a '=' */
-                        s = strchr(quark_str(j_ptr->note), '=');
-
-                        /* Process permissions */
-                        while (s)
-                        {
-                                /* =g ('g'et) means auto pickup */
-                                if (s[1] == 'g') return (TRUE);
-
-                                /* Find another '=' */
-                                s = strchr(s + 1, '=');
-                        }
-                }
-        }
@@ -613 +579 @@
- *
- * Called with pickup:
- and describe non-gold
+, auto-pickup some objects, and describe others
- * 1 to pick up objects either with or without displaying a menu.
- * 2 to pick up objects, allowing cancel and quick pickup of single objects.
- * 3 to pick up objects, forcing a menu for any number of objects.
- *
- * Use the "p_ptr->auto_pickup_okay" variable to allow or dis-allow
- * automatically picking things up that take time.  (NOT INCLUDED)
- *
- * Scan the list of objects in that floor grid.   Pick up gold automatically.
@@ -816 +779 @@
-
-                /* Automatically pick up items into the backpack */
-(p_ptr->auto_pickup_okay) && (pickup) && (auto_pickup_okay(o_ptr, TRUE)
+p_ptr->auto_pickup_okay && auto_pickup_okay(o_ptr, TRUE
-                {
-                        /* Pick up the object (with a message) */
@@ -1548 +1511 @@
- * and also handles attempting to move into walls/doors/rubble/etc.
- */
-, int do_pickup
+
-{
-        int py = p_ptr->py;
@@ -1688 +1651 @@
-                        p_ptr->command_new = '_';
-
-                        /* Free turn XXX XXX XXX */
-                        p_ptr->energy_use = 0;
-
-                        /* Handle objects now.  XXX */
-
-
+
+
+
-
-                /* All other grids (including traps) */
@@ -1699 +1660 @@
-                {
-                        /* Handle objects (later) */
-
-
+
-                }
-
@@ -2429 +2389 @@
-        }
-
+
-        /* Decrease counter */
-        p_ptr->running--;
@@ -2436 +2397 @@
-
-        /* Move the player.  Never pick up objects */
-
+
+
-}
-
-

trunk/src/cmd2.c

@@ -2045 +2045 @@
-
-/*
-and "jump" commands
-
-static void do_cmd_walk_or_jump(int do_pickup
+command
+
+void do_cmd_walk(void
-{
-        int y, x, dir;
-
-
-        /* Get a direction (or abort) */
@@ -2094 +2093 @@
-
-        /* Move the player */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
@@ -2182 +2162 @@
- * Pick up treasure if "pickup" is true.
- */
-static void do_cmd_hold_or_stay(int pickup
+void do_cmd_hold(void
-{
-        /* Allow repeated command */
@@ -2213 +2193 @@
-
-        /* Handle objects now.  XXX XXX XXX */
-
+always_
-
-        /* Hack -- enter a store if we are on one */
@@ -2228 +2208 @@
-                p_ptr->energy_use = 0;
-        }
-}
-
-
-/*
- * Hold still (usually pickup)
- */
-void do_cmd_hold(void)
-{
-        /* Hold still (usually pickup) */
-        do_cmd_hold_or_stay(always_pickup);
-}
-

trunk/src/defines.h

@@ -1559 +1559 @@
- * Bit flags for the "p_ptr->notice" variable
- */
-             
-             
+      
+      
-#define PN_AUTOINSCRIBE 0x00000004L     /* Autoinscribe items */
-
-
+
-/* xxx (many) */
-

trunk/src/dungeon.c

@@ -1271 +1271 @@
-
-                /* Picking up objects */
-1
+
-                {
-                        /* Recursively call the pickup function, use energy */
-
-
-
-
-
-
-
-
-
-
+
+
-                }
-

trunk/src/externs.h

@@ -305 +305 @@
-extern void hit_trap(int y, int x);
-extern void py_attack(int y, int x);
-, int do_pickup
+
-extern void run_step(int dir);
-bool do_cmd_walk_test(int y, int x);

trunk/src/types.h

@@ -199 +199 @@
-
-        u16b flavor;            /* Special object flavor (or zero) */
-
-
-;    
-;    
-
-;  
-; 
+
+
+ : 1;
+ : 1;
+
+ : 1;
+ : 1;
-};
-