Changeset 1429

Timestamp:

06/04/09 22:51:08 (15 months ago)

Author:

ajps

Message:

Should be the last of the input checking for game commands.

Location:

trunk/src

Files:

• cmd-obj.c (modified) (6 diffs)
• cmd3.c (modified) (1 diff)

trunk/src/cmd-obj.c

@@ -201 +201 @@
         object_type *o_ptr = object_from_item_idx(args[0].item);
 
+        if (obj_has_inscrip(o_ptr))
+                msg_print("Inscription removed.");
+
         o_ptr->note = 0;
-        msg_print("Inscription removed.");
 
         p_ptr->notice |= (PN_COMBINE | PN_SQUELCH);
@@ -265 +267 @@
         int item = args[0].item;
 
+        if (!item_is_available(item, NULL, USE_EQUIP))
+        {
+                msg_print("You are not wielding that item.");
+                return;
+        }
+
+        if (!obj_can_takeoff(object_from_item_idx(item)))
+        {
+                msg_print("You cannot take off that item.");
+                return;
+        }
+
         (void)inven_takeoff(item, 255);
         p_ptr->energy_use = 50;
@@ -280 +294 @@
         
         int item = args[0].item;
-        
         object_type *o_ptr = object_from_item_idx(item);
+
+        if (!item_is_available(item, NULL, USE_INVEN | USE_FLOOR))
+        {
+                msg_print("You do not have that item to wield.");
+                return;
+        }       
 
         /* Check the slot */
@@ -622 +641 @@
 }
 
+
 /*** Refuelling ***/
-
-static bool obj_refill_pre(void)
-{
-        object_type *o_ptr;
+void do_cmd_refill(cmd_code code, cmd_arg args[])
+{
+        object_type *j_ptr = &inventory[INVEN_LITE];
         u32b f[OBJ_FLAG_N];
 
-        o_ptr = &inventory[INVEN_LITE];
-        object_flags(o_ptr, f);
-
-        if (o_ptr->tval != TV_LITE)
-        {
-                msg_print("You are not wielding a light.");
-                return FALSE;
-        }
-
-        else if (f[2] & TR2_NO_FUEL)
-        {
-                msg_print("Your light cannot be refilled.");
-                return FALSE;
-        }
-
-        return TRUE;
-}
-
-void do_cmd_refill(cmd_code code, cmd_arg args[])
-{
-        object_type *j_ptr = &inventory[INVEN_LITE];
         int item = args[0].item;
         object_type *o_ptr = object_from_item_idx(item);
-        p_ptr->energy_use = 50;
+
+        if (!item_is_available(item, NULL, USE_INVEN | USE_FLOOR))
+        {
+                msg_print("You do not have that item to refill with it.");
+                return;
+        }
+
+        /* Check what we're wielding. */
+        object_flags(j_ptr, f);
+
+        if (j_ptr->tval != TV_LITE)
+        {
+                msg_print("You are not wielding a light.");
+                return;
+        }
+
+        else if (f[2] & TR2_NO_FUEL)
+        {
+                msg_print("Your light cannot be refilled.");
+                return;
+        }
 
         /* It's a lamp */
@@ -662 +680 @@
                 refuel_torch(j_ptr, o_ptr, item);
 
+        p_ptr->energy_use = 50;
 }
 
@@ -759 +778 @@
         { NULL, CMD_REFILL, "refill",
       "Refuel with what fuel source? ", "You have nothing to refuel with.",
-          obj_can_refill, (USE_INVEN | USE_FLOOR), obj_refill_pre },
+          obj_can_refill, (USE_INVEN | USE_FLOOR), NULL },
 };
 

trunk/src/cmd3.c

@@ -216 +216 @@
         {
                 squelch_items();
+                return;
+        }
+
+        if (!item_is_available(item, NULL, USE_INVEN | USE_EQUIP | USE_FLOOR))
+        {
+                msg_print("You do not have that item to destroy it.");
                 return;
         }