Changeset 1456 for trunk

Timestamp:

06/29/09 13:13:34 (9 months ago)

Author:

ajps

Message:

Put checks for launchers and ammo being available when firing and throwing. Disable the repeat command in a couple more places where the inventory is reordered to stop wrong ammo, etc, being used (fixes #760).

Location:

trunk/src

Files:

• attack.c (modified) (2 diffs)
• object/obj-util.c (modified) (2 diffs)

trunk/src/attack.c

@@ -491 +491 @@
         int msec = op_ptr->delay_factor * op_ptr->delay_factor;
 
+        /* Get the "bow" */
+        j_ptr = &inventory[INVEN_BOW];
+
+        /* Require a usable launcher */
+        if (!j_ptr->tval || !p_ptr->state.ammo_tval)
+        {
+                msg_print("You have nothing to fire with.");
+                return;
+        }
+
         /* Get item to fire and direction to fire in. */
         item = args[0].item;
         dir = args[1].direction;
 
+        /* Check the item being fired is usable by the player. */
+        if (!item_is_available(item, NULL, (USE_INVEN | USE_FLOOR)))
+        {
+                msg_format("That item is not within your reach.");
+                return;
+        }
+
         /* Get the object for the ammo */
         o_ptr = object_from_item_idx(item);
 
-        /* Get the "bow" */
-        j_ptr = &inventory[INVEN_BOW];
+        /* Check the ammo can be used with the launcher */
+        if (o_ptr->tval != p_ptr->state.ammo_tval)
+        {
+                msg_format("That ammo cannot be fired by your current weapon.");
+                return;
+        }
 
         /* Base range XXX XXX */
@@ -808 +829 @@
         dir = args[1].direction;
 
+        /* Check the item being thrown is usable by the player. */
+        if (!item_is_available(item, NULL, (USE_INVEN | USE_FLOOR)))
+        {
+                msg_format("That item is not within your reach.");
+                return;
+        }
+
         /* Get the object */
         o_ptr = object_from_item_idx(item);

trunk/src/object/obj-util.c

@@ -2334 +2334 @@
                 /* Redraw stuff */
                 p_ptr->redraw |= (PR_INVEN);
+
+                /* Inventory has changed, repeated command may use the wrong item */ 
+                cmd_disable_repeat();           
         }
 
@@ -2893 +2896 @@
 
         /* Message */
-        if (flag) msg_print("You combine some items in your pack.");
+        if (flag)
+        {
+                msg_print("You combine some items in your pack.");
+
+                /* Stop "repeat last command" from working. */
+                cmd_disable_repeat();
+        }
 }