Changeset 1424 for trunk

Timestamp:

06/01/09 16:05:44 (15 months ago)

Author:

ajps

Message:

Add some more basic arg checking for game commands, and fix a bug where we weren't passing a direction to aimable commands.

Location:

trunk/src

Files:

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

trunk/src/cmd-obj.c

@@ -429 +429 @@
         int snd;
         use_type use;
+        int items_allowed = 0;
 
         /* Determine how this item is used. */
@@ -435 +436 @@
                 use = USE_TIMEOUT;
                 snd = MSG_ZAP_ROD;
+                items_allowed = USE_INVEN | USE_FLOOR;
         }
         else if (obj_is_wand(o_ptr))
@@ -440 +442 @@
                 use = USE_CHARGE;
                 snd = MSG_ZAP_ROD;
+                items_allowed = USE_INVEN | USE_FLOOR;
         }
         else if (obj_is_staff(o_ptr))
@@ -445 +448 @@
                 use = USE_CHARGE;
                 snd = MSG_ZAP_ROD;
+                items_allowed = USE_INVEN | USE_FLOOR;
         }
         else if (obj_is_food(o_ptr))
@@ -450 +454 @@
                 use = USE_SINGLE;
                 snd = MSG_EAT;          
+                items_allowed = USE_INVEN | USE_FLOOR;
         }
         else if (obj_is_potion(o_ptr))
@@ -455 +460 @@
                 use = USE_SINGLE;
                 snd = MSG_QUAFF;                
+                items_allowed = USE_INVEN | USE_FLOOR;
         }
         else if (obj_is_scroll(o_ptr))
         {
+                /* Check player can use scroll */
+                if (!player_can_read())
+                        return;
+
                 use = USE_SINGLE;
                 snd = MSG_GENERIC;              
+                items_allowed = USE_INVEN | USE_FLOOR;
         }
         else if (obj_can_activate(o_ptr))
         {
                 use = USE_TIMEOUT;
-                snd = MSG_ACT_ARTIFACT;         
+                snd = MSG_ACT_ARTIFACT;
+                items_allowed = USE_EQUIP;
+        }
+
+        /* Check if item is within player's reach. */
+        if (items_allowed == 0 || !item_is_available(item, NULL, items_allowed))
+        {
+                msg_print("You cannot use that item from its current location.");
+                return;
         }
 
@@ -476 +495 @@
         if (obj_needs_aim(o_ptr))
         {
-                /* Get a direction, allow cancel */
-                if (!get_aim_dir(&dir))
-                        return;
+                dir = args[1].direction;
         }
 
@@ -795 +812 @@
         if (item_actions[act].action != NULL)
                 item_actions[act].action(o_ptr, item);
+        else if (obj_needs_aim(o_ptr))
+                cmd_insert(item_actions[act].command, item, DIR_UNKNOWN);
         else
-                cmd_insert(item_actions[act].command, item);            
+                cmd_insert(item_actions[act].command, item);
 }
 

trunk/src/cmd5.c

@@ -579 +579 @@
 }
 
-/* Check if the given item is available for the player to use. */
-static bool item_is_available(int item, int mode)
-{
-        int item_list[INVEN_TOTAL + MAX_FLOOR_STACK];
-        int item_num;
-        int i;
-
-        item_num = scan_items(item_list, N_ELEMENTS(item_list), mode);
-
-        for (i = 0; i < item_num; i++)
-        {
-                if (item_list[i] == item)
-                        return TRUE;
-        }
-
-        return FALSE;
-}
-
 /* Gain a random spell from the given book (for priests) */
 void do_cmd_study_book(cmd_code code, cmd_arg args[])
@@ -613 +595 @@
 
         /* Check that the player has access to the nominated spell book. */
-        item_tester_hook = obj_can_browse;
-        if (!item_is_available(book, (USE_INVEN | USE_FLOOR)))
+        if (!item_is_available(book, obj_can_browse, (USE_INVEN | USE_FLOOR)))
         {
                 msg_format("That item is not within your reach.");

trunk/src/object/obj-util.c

@@ -3722 +3722 @@
 
 
-
+/* 
+ * Check if the given item is available for the player to use. 
+ *
+ * 'mode' defines which areas we should look at, a la scan_items().
+ */
+bool item_is_available(int item, bool (*tester)(const object_type *), int mode)
+{
+        int item_list[INVEN_TOTAL + MAX_FLOOR_STACK];
+        int item_num;
+        int i;
+
+        item_tester_hook = tester;
+        item_tester_tval = 0;
+        item_num = scan_items(item_list, N_ELEMENTS(item_list), mode);
+
+        for (i = 0; i < item_num; i++)
+        {
+                if (item_list[i] == item)
+                        return TRUE;
+        }
+
+        return FALSE;
+}
+
+

trunk/src/object/object.h

@@ -171 +171 @@
 bool get_item_okay(int item);
 int scan_items(int *item_list, size_t item_list_max, int mode);
+bool item_is_available(int item, bool (*tester)(const object_type *), int mode);
 
 /* obj-power.c and randart.c */