Changeset 119

Timestamp:

05/07/07 06:06:43 (1 year ago)

Author:

takkaria

Message:

Commit Sangband-style object handling. This comes with the reduction of yet another option. :) (Leon Marrick)

Files:

• trunk/lib/help/command.txt (modified) (1 diff)
• trunk/lib/help/option.txt (modified) (2 diffs)
• trunk/lib/help/playing.txt (modified) (2 diffs)
• trunk/src/cmd1.c (modified) (10 diffs)
• trunk/src/cmd2.c (modified) (4 diffs)
• trunk/src/defines.h (modified) (2 diffs)
• trunk/src/dungeon.c (modified) (2 diffs)
• trunk/src/externs.h (modified) (3 diffs)
• trunk/src/object1.c (modified) (11 diffs)
• trunk/src/tables.c (modified) (6 diffs)
• trunk/src/xtra2.c (modified) (3 diffs)

trunk/lib/help/command.txt

@@ -132 +132 @@
-        may take a count, and takes some energy.
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-Rest (R)

trunk/lib/help/option.txt

@@ -30 +30 @@
-    "[y/n]" prompt.
-
-***** <floor_query_flag>
-Prompt for floor item selection    [floor_query_flag]
-    Allows the user to select objects from the center of stacks.  Without
-    this option, the uppermost appropriate object will always be selected.
-
-***** <carry_query_flag>
-Prompt before picking things up    [carry_query_flag]
-    Forces the game to ask your permission before allowing you to pick up
-    any object.
-
-***** <use_old_target>
-Use old target by default    [use_old_target]
@@ -47 +37 @@
-
-***** <always_pickup>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-***** <always_repeat>

trunk/lib/help/playing.txt

@@ -87 +87 @@
- e  Equipment list                       E  Eat some food
- f  Fire an item                         F  Fuel your lantern/torch
-Stay still (flip pickup)
+Get objects on floor    
- h  (unused)                             H  (unused)
- i  Inventory list                       I  Observe an item
@@ -147 +147 @@
- e  Equipment list                       E  Eat some food
- f  Bash a door (force)                  F  Fuel your lantern/torch
-Stay still (flip pickup)
+Get objects on floor    
- h  (walk - west)                        H  (run - west)
- i  Inventory list                       I  Observe an item

trunk/src/cmd1.c

@@ -493 +493 @@
- * Determine if the object can be picked up, and has "=g" in its inscription.
- */
-
+, bool check_pack
-{
-        cptr s;
@@ -508 +508 @@
-                object_aware_p(o_ptr)) return (TRUE);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -530 +568 @@
-
-/*
-
-
-
-
-
+
- */
-
+, bool msg
-{
-        int slot;
-
-        char o_name[80];
-
-
-
+
-
-        /* Carry the object */
-        slot = inven_carry(o_ptr);
-
-
+
+
+
+
-        o_ptr = &inventory[slot];
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        /* Delete the object */
@@ -563 +602 @@
-
-/*
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-void
+byte
-{
-        int py = p_ptr->py;
-        int px = p_ptr->px;
-
+        char o_name[80];
+        char ch;
+
-        s16b this_o_idx, next_o_idx = 0;
-
-        object_type *o_ptr;
-
-
-
+
+
+
+
+
+
+
-        int sound_msg;
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        /* Automatically destroy squelched items in pile if necessary */
-        squelch_pile(py, px);
-
-
+
+
-        for (this_o_idx = cave_o_idx[py][px]; this_o_idx; this_o_idx = next_o_idx)
-        {
-                bool do_not_pickup = FALSE;
-
-                /* Get the object */
-                o_ptr = &o_list[this_o_idx];
-
-                /* Describe the object */
-                object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
-
-                /* Get the next object */
-                next_o_idx = o_ptr->next_o_idx;
-
+                /* Ignore all hidden objects */
+                if (!o_ptr->marked) continue;
+
+                /* Paranoia -- ignore all dead objects  XXX */
+                if (!o_ptr->k_idx) continue;
+
-                /* Hack -- disturb */
-                disturb(0, 0);
-
-#if 0
-                /*
-                 * I'm pretty sure this chunk of code is pointless, because
-                 * squelch_pile() should already have removed anything that is both
-                 * known and SQUELCH_ALWAYS.  OTOH, I didn't write it, so I leave it
-                 * here just in case.  -AS-
-                 */
-
-                /* End loop if squelched stuff reached */
-                if ((k_info[o_ptr->k_idx].squelch == SQUELCH_ALWAYS) &&
-                        (k_info[o_ptr->k_idx].aware))
-                {
-                        next_o_idx = 0;
-                        continue;
-                }
-#endif
-
-                /* Pick up gold */
@@ -630 +703 @@
-
-                        /* Message */
-ld gold pieces worth of %
-               (long)o_ptr->pval, o_name
+s worth %ld gold piece
+       o_name, (long)o_ptr->pval
-
-                        /* Collect the gold */
@@ -649 +722 @@
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                        continue;
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        else
-                        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        msg_format("You have no room for %s.", o_name);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                /* Pick up the object */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
+
-
-
@@ -1261 +1455 @@
- * and also handles attempting to move into walls/doors/rubble/etc.
- */
-jumping
+do_pickup
-{
-        int py = p_ptr->py;
@@ -1281 +1475 @@
-        }
-
-(non-jumping) 
- !jumping &&
+
+
-                 (cave_info[y][x] & (CAVE_MARK)) &&
-                 (cave_feat[y][x] >= FEAT_TRAP_HEAD) &&
-                 (cave_feat[y][x] <= FEAT_DOOR_TAIL))
-        {
+                /*
+                 * There should always be an explicit confirmation made before fiddling
+                 * with traps.  XXX XXX
+                 */
+
-                /* Not already repeating */
-                if (!p_ptr->command_rep)
@@ -1389 +1588 @@
-                }
-
-
-
+
+
+
+
+
+
+
+
+
-
-                /* Handle "store doors" */
@@ -2162 +2368 @@
-        p_ptr->energy_use = 100;
-
-
+.  Never pick up objects
-        move_player(p_ptr->run_cur_dir, FALSE);
-}
-
+

trunk/src/cmd2.c

@@ -2051 +2051 @@
- * Helper function for the "walk" and "jump" commands.
- */
-jumping
+do_pickup
-{
-        int y, x, dir;
@@ -2098 +2098 @@
-
-        /* Move the player */
-jumping
-
-
-
-
-.
+do_pickup
+
+
+
+
+ (pick up objects as set by the auto-pickup option)
- */
-void do_cmd_walk(void)
-{
-normal
-FALSE
-
-
-
-
-.
+usually pickup
+always_pickup
+
+
+
+
+ (flip pickup mode)
- */
-void do_cmd_jump(void)
-{
-jum
-TRUE
+usually do not picku
+!always_pickup
-}
-
@@ -2216 +2216 @@
-        }
-
-"objects"
-y_pickup(pickup)
+objects now.  XXX XXX XXX
+_ptr->energy_use += py_pickup(pickup) * 10
-
-        /* Hack -- enter a store if we are on one */
@@ -2245 +2245 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+