Changeset 1455 for trunk

Timestamp:

06/28/09 09:36:16 (14 months ago)

Author:

ajps

Message:

Stop requesting an aim for wielding, etc, items with an activation. Closes bug #889.

Files:

• trunk/src/cmd-obj.c (modified) (2 diffs)

trunk/src/cmd-obj.c

@@ -834 +834 @@
         int item;
         object_type *o_ptr;
+        bool cmd_needs_aim = FALSE;
 
         cptr q, s;
@@ -852 +853 @@
         o_ptr = object_from_item_idx(item);
 
+        /* These commands need an aim */
+        if (item_actions[act].command == CMD_QUAFF ||
+                item_actions[act].command == CMD_ACTIVATE ||
+                item_actions[act].command == CMD_USE_WAND ||
+                item_actions[act].command == CMD_USE_ROD ||
+                item_actions[act].command == CMD_USE_STAFF ||
+                item_actions[act].command == CMD_READ_SCROLL)
+        {
+                cmd_needs_aim = TRUE;
+        }
+
         if (item_actions[act].action != NULL)
                 item_actions[act].action(o_ptr, item);
-        else if (obj_needs_aim(o_ptr))
+        else if (cmd_needs_aim && obj_needs_aim(o_ptr))
         {
                 int dir;