Changeset 385

Timestamp:

07/27/07 17:48:46 (1 year ago)

Author:

takkaria

Message:

Restore the "jump into trap and don't autopickup" command. It's worth it, honest. (#241)

Files:

• branches/angband-3.0.8/src/cmd0.c (modified) (1 diff)
• branches/angband-3.0.8/src/cmd1.c (modified) (2 diffs)
• branches/angband-3.0.8/src/cmd2.c (modified) (1 diff)
• branches/angband-3.0.8/src/dungeon.c (modified) (1 diff)

branches/angband-3.0.8/src/cmd0.c

@@ -154 +154 @@
-        { "Alter a grid",             '+', do_cmd_alter },
-        { "Walk",                     ';', do_cmd_walk },
+        { "Jump into a trap",         '-', do_cmd_jump },
-        { "Start running",            '.', do_cmd_run },
-        { "Stand still",              ',', do_cmd_hold },

branches/angband-3.0.8/src/cmd1.c

@@ -756 +756 @@
-        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 */
@@ -780 +786 @@
-
-                /* Automatically pick up items into the backpack */
-p_ptr->auto_pickup
+auto
-                {
-                        /* Pick up the object with message */

branches/angband-3.0.8/src/cmd2.c

@@ -2095 +2095 @@
-        /* Move the player */
-        move_player(dir);
+}
+
+/*
+ * Jump into a trap, turn off pickup.
+ *
+ * What a horrible function.
+ */
+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) */
+        old_easy_alter = easy_alter;
+        easy_alter = FALSE;
+
+        /* Now actually do this silly walk */
+        do_cmd_walk();
+
+        /* Restore easy_alter */
+        easy_alter = old_easy_alter;
-}
-

branches/angband-3.0.8/src/dungeon.c

@@ -1473 +1473 @@
-
-        while (!p_ptr->energy_use && !p_ptr->leaving);
-
-
-        /* Allowed to automatically pick up things again */
-        p_ptr->auto_pickup_okay = TRUE;
-}
-