Changeset 1445 for trunk

Timestamp:

06/20/09 21:20:53 (9 months ago)

Author:

ajps

Message:

Fix bug allowing repeated use of rods and activatable objects before they had recharged (#882). The use command now checks the status of these items before carrying out the action.

Location:

trunk/src

Files:

• cmd-obj.c (modified) (2 diffs)
• object/obj-util.c (modified) (3 diffs)
• object/object.h (modified) (1 diff)

trunk/src/cmd-obj.c

@@ -473 +473 @@
         if (obj_is_rod(o_ptr))
         {
+                if (!obj_can_zap(o_ptr))
+                {
+                        msg_print("The rod is not yet recharged.");
+                        return;
+                }
+
                 use = USE_TIMEOUT;
                 snd = MSG_ZAP_ROD;
@@ -511 +517 @@
                 items_allowed = USE_INVEN | USE_FLOOR;
         }
-        else if (obj_can_activate(o_ptr))
-        {
+        else if (obj_is_activatable(o_ptr))
+        {
+                if (!obj_can_activate(o_ptr))
+                {
+                        msg_print("The item is not ready to activate");
+                        return;
+                }
+                
                 use = USE_TIMEOUT;
                 snd = MSG_ACT_ARTIFACT;
                 items_allowed = USE_EQUIP;
+        }
+        else
+        {
+                msg_print("The item cannot be used at the moment");
         }
 

trunk/src/object/obj-util.c

@@ -3574 +3574 @@
 
 /* Determine if an object is activatable */
-bool obj_can_activate(const object_type *o_ptr)
+bool obj_is_activatable(const object_type *o_ptr)
 {
         u32b f[OBJ_FLAG_N];
@@ -3581 +3581 @@
         if (!object_known_p(o_ptr)) return (FALSE);
 
-        /* Check the recharge */
-        if (o_ptr->timeout) return (FALSE);
-
         /* Extract the flags */
         object_flags(o_ptr, f);
@@ -3589 +3586 @@
         /* Check activation flag */
         return (f[2] & TR2_ACTIVATE) ? TRUE : FALSE;
+}
+
+/* Determine if an object can be activated now */
+bool obj_can_activate(const object_type *o_ptr)
+{
+        if (obj_is_activatable(o_ptr))
+        {
+                /* Check the recharge */
+                if (!o_ptr->timeout) return TRUE;
+        }
+
+        return FALSE;
 }
 

trunk/src/object/object.h

@@ -162 +162 @@
 bool obj_is_food(const object_type *o_ptr);
 bool obj_can_zap(const object_type *o_ptr);
+bool obj_is_activatable(const object_type *o_ptr);
 bool obj_can_activate(const object_type *o_ptr);
 bool obj_can_refill(const object_type *o_ptr);