Changeset 1428 for trunk

Timestamp:

06/04/09 21:57:14 (15 months ago)

Author:

ajps

Message:

Add input-checking on drop command. Change it to take number of items to drop as an argument, as destroy.

Location:

trunk/src

Files:

• cmd-obj.c (modified) (3 diffs)
• game-cmd.c (modified) (2 diffs)

trunk/src/cmd-obj.c

@@ -321 +321 @@
         int item = args[0].item;
         object_type *o_ptr = object_from_item_idx(item);
+        int amt = args[1].number;
+
+        if (!item_is_available(item, NULL, USE_INVEN | USE_EQUIP))
+        {
+                msg_print("You do not have that item to drop it.");
+                return;
+        }
+
+        /* Hack -- Cannot remove cursed items */
+        if ((item >= INVEN_WIELD) && cursed_p(o_ptr))
+        {
+                msg_print("Hmmm, it seems to be cursed.");
+                return;
+        }
+
+        inven_drop(item, amt);
+        p_ptr->energy_use = 50;
+}
+
+static void obj_drop(object_type *o_ptr, int item)
+{
         int amt;
 
@@ -326 +347 @@
         if (amt <= 0) return;
 
-        /* Hack -- Cannot remove cursed items */
-        if ((item >= INVEN_WIELD) && cursed_p(o_ptr))
-        {
-                msg_print("Hmmm, it seems to be cursed.");
-                return;
-        }
-
-        inven_drop(item, amt);
-        p_ptr->energy_use = 50;
+        cmd_insert(CMD_DROP, item, amt);
 }
 
@@ -698 +711 @@
           obj_can_wear, (USE_INVEN | USE_FLOOR), NULL },
 
-        { NULL, CMD_DROP, "drop",
+        { obj_drop, CMD_NULL, "drop",
           "Drop which item? ", "You have nothing to drop.",
           NULL, (USE_EQUIP | USE_INVEN), NULL },

trunk/src/game-cmd.c

@@ -157 +157 @@
                 case CMD_WIELD:
                 case CMD_TAKEOFF:
-                case CMD_DROP:
                 case CMD_REFILL:
                 case CMD_STUDY_BOOK:
@@ -196 +195 @@
                 }
 
-                /* This takes an item number and a number of those items to destroy. */
+                /* These take an item number and a number of those items to process. */
+                case CMD_DROP:
                 case CMD_DESTROY:
                 {
+                        /* TODO: Number should probably be replaced by 'repeat'ing */
                         cmd.args[0].item = va_arg(vp, int);
                         cmd.args[1].number = va_arg(vp, int);