Changeset 1435

Timestamp:

06/08/09 21:17:05 (9 months ago)

Author:

ajps

Message:

Move the store commands (buying, selling, and home equivalents) to the new command system.

Location:

trunk/src

Files:

• cmd3.c (modified) (4 diffs)
• cmds.h (modified) (1 diff)
• externs.h (modified) (1 diff)
• game-cmd.c (modified) (2 diffs)
• game-cmd.h (modified) (1 diff)
• object/obj-util.c (modified) (1 diff)
• object/object.h (modified) (1 diff)
• store.c (modified) (45 diffs)

trunk/src/cmd3.c

@@ -204 +204 @@
         object_type *o_ptr;
 
-        object_type *i_ptr;
-        object_type object_type_body;
+        object_type destroyed_obj;
 
         char o_name[120];
@@ -234 +233 @@
         }       
 
-        /* Get local object */
-        i_ptr = &object_type_body;
-        object_copy(i_ptr, o_ptr);
-
-        if ((o_ptr->tval == TV_WAND) ||
-            (o_ptr->tval == TV_STAFF) ||
-            (o_ptr->tval == TV_ROD))
-        {
-                /* Calculate the amount of destroyed charges */
-                i_ptr->pval = o_ptr->pval * amt / o_ptr->number;
-        }
-
-        /* Set quantity */
-        i_ptr->number = amt;
-
-        /* Describe the destroyed object */
-        object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
+        /* Describe the destroyed object by taking a copy with the right "amt" */
+        object_copy_amt(&destroyed_obj, o_ptr, amt);
+        object_desc(o_name, sizeof(o_name), &destroyed_obj, TRUE, ODESC_FULL);
 
         /* Artifacts cannot be destroyed */
@@ -299 +284 @@
         object_type *o_ptr;
 
-        object_type *i_ptr;
-        object_type object_type_body;
+        object_type obj_to_destroy;
 
         char o_name[120];
@@ -325 +309 @@
         if (amt <= 0) return;
 
-        /* Get local object */
-        i_ptr = &object_type_body;
-        object_copy(i_ptr, o_ptr);
-
-        if ((o_ptr->tval == TV_WAND) ||
-            (o_ptr->tval == TV_STAFF) ||
-            (o_ptr->tval == TV_ROD))
-        {
-                /* Calculate the amount of destroyed charges */
-                i_ptr->pval = o_ptr->pval * amt / o_ptr->number;
-        }
-
-        /* Set quantity */
-        i_ptr->number = amt;
-
-        /* Describe the destroyed object */
-        object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
+        /* Describe the destroyed object by taking a copy with the right "amt" */
+        object_copy_amt(&obj_to_destroy, o_ptr, amt);
+        object_desc(o_name, sizeof(o_name), &obj_to_destroy, TRUE, ODESC_FULL);
 
         /* Verify destruction */

trunk/src/cmds.h

@@ -132 +132 @@
 /* store.c */
 extern void do_cmd_store(cmd_code code, cmd_arg args[]);
+extern void do_cmd_sell(cmd_code code, cmd_arg args[]);
+extern void do_cmd_stash(cmd_code code, cmd_arg args[]);
+extern void do_cmd_buy(cmd_code code, cmd_arg args[]);
+extern void do_cmd_retrieve(cmd_code code, cmd_arg args[]);
 
 /* Types of item use */

trunk/src/externs.h

@@ -566 +566 @@
 void store_shuffle(int which);
 void store_maint(int which);
-bool store_overflow(void);
 
 /* target.c */

trunk/src/game-cmd.c

@@ -213 +213 @@
                 case CMD_DROP:
                 case CMD_DESTROY:
+                case CMD_SELL:
+                case CMD_BUY:
+                case CMD_STASH:
+                case CMD_RETRIEVE:
                 {
                         /* TODO: Number should probably be replaced by 'repeat'ing */
@@ -284 +288 @@
         { CMD_STUDY_BOOK, do_cmd_study_book },
         { CMD_CAST, do_cmd_cast },
+        { CMD_SELL, do_cmd_sell },
+        { CMD_STASH, do_cmd_stash },
+        { CMD_BUY, do_cmd_buy },
+        { CMD_RETRIEVE, do_cmd_retrieve },
 };
 

trunk/src/game-cmd.h

@@ -74 +74 @@
         CMD_ENTER_STORE,
         CMD_ALTER,
-        
+
+    /* Store commands */        
+        CMD_SELL,
+        CMD_BUY,
+        CMD_STASH,
+        CMD_RETRIEVE,
 
         /* Hors categorie Commands */

trunk/src/object/obj-util.c

@@ -1775 +1775 @@
         /* Copy the structure */
         COPY(o_ptr, j_ptr, object_type);
+}
+
+/*
+ * Prepare an object `dst` representing `amt` objects,  based on an existing 
+ * object `src` representing at least `amt` objects.
+ *
+ * Takes care of the charge redistribution concerns of stacked items.
+ */
+void object_copy_amt(object_type *dst, object_type *src, int amt)
+{
+        /* Get a copy of the object */
+        object_copy(dst, src);
+
+        /* Modify quantity */
+        dst->number = amt;
+        
+        /* If the item has charges, set them to the correct level too */
+        reduce_charges(dst, src->number - amt);
 }
 

trunk/src/object/object.h

@@ -125 +125 @@
 void object_wipe(object_type *o_ptr);
 void object_copy(object_type *o_ptr, const object_type *j_ptr);
+void object_copy_amt(object_type *dst, object_type *src, int amt);
 void object_prep(object_type *o_ptr, int k_idx);
 s16b floor_carry(int y, int x, object_type *j_ptr);

trunk/src/store.c

@@ -74 +74 @@
 /** Variables to maintain state XXX ***/
 
-/* Current store number */
-static int store_current;
-
 /* Flags for the display */
 static u16b store_flags;
@@ -384 +381 @@
 
 
+#define STORE_NONE -1
+
+/* Get the current store number, or STORE_NONE if not in a store */
+static int current_store()
+{
+        if ((cave_feat[p_ptr->py][p_ptr->px] >= FEAT_SHOP_HEAD) &&
+                (cave_feat[p_ptr->py][p_ptr->px] <= FEAT_SHOP_TAIL))
+                return (cave_feat[p_ptr->py][p_ptr->px] - FEAT_SHOP_HEAD);
+
+        return STORE_NONE;
+}
 
 
@@ -407 +415 @@
         int adjust;
         s32b price;
-
-        owner_type *ot_ptr = store_owner(store_current);
+        int this_store = current_store();
+        owner_type *ot_ptr;
+
+        if (this_store == STORE_NONE) return 0L;
+
+        ot_ptr = store_owner(this_store);
 
 
@@ -422 +434 @@
 
         /* Add in the charisma factor */
-        if (store_current == STORE_B_MARKET)
+        if (this_store == STORE_B_MARKET)
                 adjust = 150;
         else
@@ -436 +448 @@
 
                 /* Mega-Hack -- Black market sucks */
-                if (store_current == STORE_B_MARKET) price = price / 2;
+                if (this_store == STORE_B_MARKET) price = price / 2;
         }
 
@@ -446 +458 @@
 
                 /* Mega-Hack -- Black market sucks */
-                if (store_current == STORE_B_MARKET) price = price * 2;
+                if (this_store == STORE_B_MARKET) price = price * 2;
         }
 
@@ -1585 +1597 @@
 
         /* Add space for for prices */
-        if (store_current != STORE_HOME)
+        if (current_store() != STORE_HOME)
                 scr_places_x[LOC_WEIGHT] -= 10;
 
@@ -1627 +1639 @@
         byte colour;
 
-        store_type *st_ptr = &store[store_current];
+        int this_store = current_store(); 
+        store_type *st_ptr = &store[this_store];
 
         (void)menu;
@@ -1637 +1650 @@
 
         /* Describe the object - preserving insriptions in the home */
-        if (store_current == STORE_HOME) desc = ODESC_FULL;
+        if (this_store == STORE_HOME) desc = ODESC_FULL;
         else desc = ODESC_FULL | ODESC_STORE;
         object_desc(o_name, sizeof(o_name), o_ptr, TRUE, desc);
@@ -1650 +1663 @@
 
         /* Describe an object (fully) in a store */
-        if (store_current != STORE_HOME)
+        if (this_store != STORE_HOME)
         {
                 /* Extract the "minimum" price */
@@ -1677 +1690 @@
 {
         char buf[80];
-
-        owner_type *ot_ptr = store_owner(store_current);
+        int this_store = current_store();
+
+        owner_type *ot_ptr = store_owner(this_store);
 
         /* Clear screen */
@@ -1684 +1698 @@
 
         /* The "Home" is special */
-        if (store_current == STORE_HOME)
+        if (this_store == STORE_HOME)
         {
                 /* Put the owner name */
@@ -1699 +1713 @@
         else
         {
-                const char *store_name = (f_name + f_info[FEAT_SHOP_HEAD + store_current].name);
+                const char *store_name = (f_name + f_info[FEAT_SHOP_HEAD + this_store].name);
                 const char *owner_name = &b_name[ot_ptr->owner_name];
 
@@ -1750 +1764 @@
         text_out_c(TERM_L_GREEN, "p");
 
-        if (store_current == STORE_HOME) text_out("' picks up");
+        if (current_store() == STORE_HOME) text_out("' picks up");
         else text_out("' purchases");
 
@@ -1756 +1770 @@
 
         text_out_c(TERM_L_GREEN, "d");
-        if (store_current == STORE_HOME) text_out("' drops");
+        if (current_store() == STORE_HOME) text_out("' drops");
         else text_out("' sells");
 
@@ -1960 +1974 @@
 
 /*
+ * Buy the item with the given index from the current store's inventory.
+ */
+void do_cmd_buy(cmd_code code, cmd_arg args[])
+{
+        int item = args[0].item;
+        int amt = args[1].number;
+
+        object_type *o_ptr;     
+        object_type object_type_body;
+        object_type *i_ptr = &object_type_body;
+
+        char o_name[80];
+        int price, item_new;
+
+        store_type *st_ptr;
+        int this_store = current_store();
+
+        if (this_store == STORE_NONE)
+        {
+                msg_print("You cannot purchase items when not in a store.");
+                return;
+        }
+
+        st_ptr = &store[this_store];
+
+        /* Get the actual object */
+        o_ptr = &st_ptr->stock[item];
+
+        /* Get desired object */
+        object_copy_amt(i_ptr, o_ptr, amt);
+
+        /* Ensure we have room */
+        if (!inven_carry_okay(i_ptr))
+        {
+                msg_print("You cannot carry that many items.");
+                return;
+        }
+
+        /* Describe the object (fully) */
+        object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
+
+        /* Extract the price for the entire stack */
+        price = price_item(i_ptr, FALSE, i_ptr->number);
+
+        if (price > p_ptr->au)
+        {
+                msg_print("You cannot afford that purchase.");
+                return;
+        }
+
+        /* Spend the money */
+        p_ptr->au -= price;
+
+        /* Update the display */
+        store_flags |= STORE_GOLD_CHANGE;
+
+        /* Buying an object makes you aware of it */
+        object_aware(i_ptr);
+
+        /* Combine / Reorder the pack (later) */
+        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+
+        /* The object no longer belongs to the store */
+        i_ptr->ident &= ~(IDENT_STORE);
+
+        /* Message */
+        if (one_in_(3)) message(MSG_STORE5, 0, ONE_OF(comment_accept));
+        msg_format("You bought %s for %ld gold.", o_name, (long)price);
+
+        /* Erase the inscription */
+        i_ptr->note = 0;
+
+        /* Give it to the player */
+        item_new = inven_carry(i_ptr);
+
+        /* Message */
+        object_desc(o_name, sizeof(o_name), &inventory[item_new], TRUE, ODESC_FULL);
+        msg_format("You have %s (%c).", o_name, index_to_label(item_new));
+
+        /* Now, reduce the original stack's pval */
+        if ((o_ptr->tval == TV_ROD) ||
+                (o_ptr->tval == TV_WAND) ||
+                (o_ptr->tval == TV_STAFF))
+        {
+                o_ptr->pval -= i_ptr->pval;
+        }
+
+        /* Handle stuff */
+        handle_stuff();
+
+        /* Remove the bought objects from the store */
+        store_item_increase(this_store, item, -amt);
+        store_item_optimize(this_store, item);
+
+        /* Store is empty */
+        if (st_ptr->stock_num == 0)
+        {
+                int i;
+
+                /* Shuffle */
+                if (one_in_(STORE_SHUFFLE))
+                {
+                        /* Message */
+                        msg_print("The shopkeeper retires.");
+
+                        /* Shuffle the store */
+                        store_shuffle(this_store);
+                        store_flags |= STORE_FRAME_CHANGE;
+                }
+
+                /* Maintain */
+                else
+                {
+                        /* Message */
+                        msg_print("The shopkeeper brings out some new stock.");
+                }
+
+                /* New inventory */
+                for (i = 0; i < 10; ++i)
+                {
+                        /* Maintain the store */
+                        store_maint(this_store);
+                }
+        }
+
+        event_signal(EVENT_INVENTORY);
+        event_signal(EVENT_EQUIPMENT);
+}
+
+/*
+ * Retrieve the item with the given index from the home's inventory.
+ */
+void do_cmd_retrieve(cmd_code code, cmd_arg args[])
+{
+        int item = args[0].item;
+        int amt = args[1].number;
+
+        object_type *o_ptr;     
+        object_type picked_item;
+        char o_name[80];
+        int item_new;
+
+        store_type *st_ptr;
+
+        if (current_store() != STORE_HOME)
+        {
+                msg_print("You are not currently at home.");
+                return;
+        }
+
+        st_ptr = &store[STORE_HOME];
+
+        /* Get the actual object */
+        o_ptr = &st_ptr->stock[item];
+
+        /* Get desired object */
+        object_copy_amt(&picked_item, o_ptr, amt);
+
+        /* Ensure we have room */
+        if (!inven_carry_okay(&picked_item))
+        {
+                msg_print("You cannot carry that many items.");
+                return;
+        }
+
+        /* Distribute charges of wands, staves, or rods */
+        distribute_charges(o_ptr, &picked_item, amt);
+        
+        /* Give it to the player */
+        item_new = inven_carry(&picked_item);
+
+        printf("%i, %i\n", amt, picked_item.number);
+        
+        /* Describe just the result */
+        object_desc(o_name, sizeof(o_name), &inventory[item_new], TRUE, ODESC_FULL);
+        
+        /* Message */
+        msg_format("You have %s (%c).", o_name, index_to_label(item_new));
+        
+        /* Handle stuff */
+        handle_stuff();
+        
+        /* Remove the items from the home */
+        store_item_increase(STORE_HOME, item, -amt);
+        store_item_optimize(STORE_HOME, item);
+        
+        event_signal(EVENT_INVENTORY);
+        event_signal(EVENT_EQUIPMENT);
+}
+
+/*
  * Buy an object from a store
  */
 static bool store_purchase(int item)
 {
-        int amt, item_new, num;
-
-        store_type *st_ptr = &store[store_current];
+        int amt, num;
 
         object_type *o_ptr;
 
-        object_type *i_ptr;
         object_type object_type_body;
+        object_type *i_ptr = &object_type_body;
 
         char o_name[80];
 
         s32b price;
+
+        int this_store = current_store();
+
+        store_type *st_ptr;
+
+        if (this_store == STORE_NONE)
+        {
+                msg_print("You cannot purchase items when not in a store.");
+                return FALSE;
+        }
+
+        st_ptr = &store[this_store];
 
         /* Get the actual object */
@@ -1985 +2200 @@
         prt("", 0, 0);
 
-        if (store_current == STORE_HOME)
+        if (this_store == STORE_HOME)
         {
                 amt = o_ptr->number;
@@ -2022 +2237 @@
 
         strnfmt(o_name, sizeof o_name, "%s how many%s? (max %d) ",
-                (store_current == STORE_HOME) ? "Take" : "Buy",
+                (this_store == STORE_HOME) ? "Take" : "Buy",
                 num ? format(" (you have %d)", num) : "", amt);
 
@@ -2031 +2246 @@
         if (amt <= 0) return FALSE;
 
-        /* Get local object */
-        i_ptr = &object_type_body;
-
         /* Get desired object */
-        object_copy(i_ptr, o_ptr);
-
-        /*
-         * XXX Stacking
-         * If a rod or wand, allocate total maximum timeouts or charges
-         * between those purchased and left on the shelf.
-         */
-        reduce_charges(i_ptr, i_ptr->number - amt);
-
-        /* Modify quantity */
-        i_ptr->number = amt;
+        object_copy_amt(i_ptr, o_ptr, amt);
 
         /* Ensure we have room */
@@ -2059 +2261 @@
 
         /* Attempt to buy it */
-        if (store_current != STORE_HOME)
+        if (this_store != STORE_HOME)
         {
                 u32b price;
@@ -2079 +2281 @@
                 if (!response) return FALSE;
 
-
-                /* Spend the money */
-                p_ptr->au -= price;
-
-                /* Update the display */
-                store_flags |= STORE_GOLD_CHANGE;
-
-                /* Buying an object makes you aware of it */
-                object_aware(i_ptr);
-
-                /* Combine / Reorder the pack (later) */
-                p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-                /* The object no longer belongs to the store */
-                i_ptr->ident &= ~(IDENT_STORE);
-
-                /* Message */
-                if (one_in_(3)) message(MSG_STORE5, 0, ONE_OF(comment_accept));
-                msg_format("You bought %s for %ld gold.", o_name, (long)price);
-
-                /* Erase the inscription */
-                i_ptr->note = 0;
-
-                /* Give it to the player */
-                item_new = inven_carry(i_ptr);
-
-                /* Message */
-                object_desc(o_name, sizeof(o_name), &inventory[item_new], TRUE, ODESC_FULL);
-                msg_format("You have %s (%c).", o_name, index_to_label(item_new));
+                cmd_insert(CMD_BUY, item, amt);
                 store_flags |= STORE_KEEP_PROMPT;
-
-                /* Now, reduce the original stack's pval */
-                if ((o_ptr->tval == TV_ROD) ||
-                    (o_ptr->tval == TV_WAND) ||
-                    (o_ptr->tval == TV_STAFF))
-                {
-                        o_ptr->pval -= i_ptr->pval;
-                }
-
-                /* Handle stuff */
-                handle_stuff();
-
-                /* Remove the bought objects from the store */
-                store_item_increase(store_current, item, -amt);
-                store_item_optimize(store_current, item);
-
-                /* Store is empty */
-                if (st_ptr->stock_num == 0)
-                {
-                        int i;
-
-                        /* Shuffle */
-                        if (one_in_(STORE_SHUFFLE))
-                        {
-                                /* Message */
-                                msg_print("The shopkeeper retires.");
-
-                                /* Shuffle the store */
-                                store_shuffle(store_current);
-                                store_flags |= STORE_FRAME_CHANGE;
-                        }
-
-                        /* Maintain */
-                        else
-                        {
-                                /* Message */
-                                msg_print("The shopkeeper brings out some new stock.");
-                        }
-
-                        /* New inventory */
-                        for (i = 0; i < 10; ++i)
-                        {
-                                /* Maintain the store */
-                                store_maint(store_current);
-                        }
-                }
         }
 
@@ -2160 +2288 @@
         else
         {
-                /* Distribute charges of wands, staves, or rods */
-                distribute_charges(o_ptr, i_ptr, amt);
-
-                /* Give it to the player */
-                item_new = inven_carry(i_ptr);
-
-                /* Describe just the result */
-                object_desc(o_name, sizeof(o_name), &inventory[item_new], TRUE, ODESC_FULL);
-
-                /* Message */
-                msg_format("You have %s (%c).", o_name, index_to_label(item_new));
+                cmd_insert(CMD_RETRIEVE, item, amt);
                 store_flags |= STORE_KEEP_PROMPT;
-
-                /* Handle stuff */
-                handle_stuff();
-
-                /* Remove the items from the home */
-                store_item_increase(store_current, item, -amt);
-                store_item_optimize(store_current, item);
-        }
+        }
+
+        /* Not kicked out */
+        return TRUE;
+}
+
+
+
+/*
+ * Determine if the current store will purchase the given object
+ */
+static bool store_will_buy_tester(const object_type *o_ptr)
+{
+        int this_store = current_store();
+        
+        if (this_store == STORE_NONE) return FALSE;
+
+        return store_will_buy(this_store, o_ptr);
+}
+
+/*
+ * Sell an item to the current store.
+ */
+void do_cmd_sell(cmd_code code, cmd_arg args[])
+{
+        int item = args[0].item;
+        int amt = args[1].number;
+        object_type sold_item;
+        int price, dummy, value;
+        char o_name[120];
+        
+        /* Get the item */
+        object_type *o_ptr = object_from_item_idx(item);
+        
+        /* Cannot remove cursed objects */
+        if ((item >= INVEN_WIELD) && cursed_p(o_ptr))
+        {
+                msg_print("Hmmm, it seems to be cursed.");
+                return;
+        }       
+        
+        /* Check we are somewhere we can sell the items. */
+        if (current_store() == STORE_NONE)
+        {
+                msg_print("You cannot sell items when not in a store.");
+                return;
+        }
+        
+        /* Check the store wants the items being sold */
+        if (!store_will_buy(current_store(), o_ptr))
+        {
+                msg_print("I do not wish to purchase this item.");
+                return;
+        }
+        
+        /* Get a copy of the object representing the number being sold */
+        object_copy_amt(&sold_item, o_ptr, amt);
+        
+        /* Check if the store has space for the items */
+        if (!store_check_num(STORE_HOME, &sold_item))
+        {
+                msg_print("I have not the room in my store to keep it.");
+                return;
+        }
+        
+        price = price_item(&sold_item, TRUE, amt);
+        
+        /* Get some money */
+        p_ptr->au += price;
+        
+        /* Update the display */
+        store_flags |= STORE_GOLD_CHANGE;
+        
+        /* Identify original object */
+        object_aware(o_ptr);
+        object_known(o_ptr);
+        
+        /* Update the auto-history if selling an artifact that was previously un-IDed. (Ouch!) */
+        if (artifact_p(o_ptr))
+                history_add_artifact(o_ptr->name1, TRUE);
+        
+        /* Combine / Reorder the pack (later) */
+        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+        
+        /* Redraw stuff */
+        p_ptr->redraw |= (PR_INVEN | PR_EQUIP);
+        
+        /* The object belongs to the store now */
+        sold_item.ident |= IDENT_STORE;
+        
+        /* Get the "apparent" value */
+        dummy = object_value(&sold_item, amt);
+        
+        /* Take a new copy of the now known-about object. */
+        object_copy_amt(&sold_item, o_ptr, amt);
+           
+        /*
+        * Hack -- Allocate charges between those wands, staves, or rods
+        * sold and retained, unless all are being sold.
+         */
+        distribute_charges(o_ptr, &sold_item, amt);
+        
+        /* Get the "actual" value */
+        value = object_value(&sold_item, amt);
+        
+        /* Get the description all over again */
+        object_desc(o_name, sizeof(o_name), &sold_item, TRUE, ODESC_FULL);
+        
+        /* Describe the result (in message buffer) */
+        msg_format("You sold %s (%c) for %ld gold.",
+                           o_name, index_to_label(item), (long)price);
+        
+        /* Analyze the prices (and comment verbally) */
+        purchase_analyze(price, value, dummy);
+        
+        /* Set squelch flag */
+        p_ptr->notice |= PN_SQUELCH;
+        
+        /* Take the object from the player */
+        inven_item_increase(item, -amt);
+        inven_item_optimize(item);
+        
+        /* Handle stuff */
+        handle_stuff();
+        
+        /* The store gets that (known) object */
+        store_carry(current_store(), &sold_item);
 
         event_signal(EVENT_INVENTORY);
         event_signal(EVENT_EQUIPMENT);
-
-        /* Not kicked out */
-        return TRUE;
-}
-
-
-
-/*
- * Determine if the current store will purchase the given object
- */
-static bool store_will_buy_tester(const object_type *o_ptr)
-{
-        return store_will_buy(store_current, o_ptr);
-}
-
+}
+
+/*
+ * Stash an item in the home.
+ */
+void do_cmd_stash(cmd_code code, cmd_arg args[])
+{
+        int item = args[0].item;
+        int amt = args[1].number;
+        object_type dropped_item;
+        object_type *o_ptr = object_from_item_idx(item);
+        char o_name[120];
+
+        /* Check we are somewhere we can stash items. */
+        if (current_store() != STORE_HOME)
+        {
+                msg_print("You are not in your home.");
+                return;
+        }
+
+        /* Cannot remove cursed objects */
+        if ((item >= INVEN_WIELD) && cursed_p(o_ptr))
+        {
+                msg_print("Hmmm, it seems to be cursed.");
+                return;
+        }       
+
+        /* Get a copy of the object representing the number being sold */
+        object_copy_amt(&dropped_item, o_ptr, amt);
+
+        if (!store_check_num(STORE_HOME, &dropped_item))
+        {
+                msg_print("Your home is full.");
+                return;
+        }
+
+        /* Distribute charges of wands/staves/rods */
+        distribute_charges(o_ptr, &dropped_item, amt);
+        
+        /* Describe */
+        msg_format("You drop %s (%c).", o_name, index_to_label(item));
+        
+        /* Take it from the players inventory */
+        inven_item_increase(item, -amt);
+        inven_item_optimize(item);
+        
+        /* Handle stuff */
+        handle_stuff();
+        
+        /* Let the home carry it */
+        home_carry(&dropped_item);
+
+        event_signal(EVENT_INVENTORY);
+        event_signal(EVENT_EQUIPMENT);
+}
 
 /*
@@ -2208 +2485 @@
 
         object_type *o_ptr;
-        object_type *i_ptr;
         object_type object_type_body;
+        object_type *i_ptr = &object_type_body;
 
         char o_name[120];
@@ -2216 +2493 @@
         const char *reject = "You have nothing that I want. ";
         const char *prompt = "Sell which item? ";
+
+        int this_store = current_store();
+
+        if (this_store == STORE_NONE)
+        {
+                msg_print("You cannot sell items when not in a store.");
+                return;
+        }
 
         /* Clear all current messages */
@@ -2221 +2506 @@
         prt("", 0, 0);
 
-        if (store_current == STORE_HOME)
+        if (this_store == STORE_HOME)
                 prompt = "Drop which item? ";
         else
@@ -2255 +2540 @@
         if (amt <= 0) return;
 
-
-        /* Get local object */
-        i_ptr = &object_type_body;
-
-        /* Get a copy of the object */
-        object_copy(i_ptr, o_ptr);
-
-        /* Modify quantity */
-        i_ptr->number = amt;
-
-
-        /*
-         * XXX Stacking
-         * If a rod, wand, or staff, allocate total maximum timeouts or charges
-         * to those being sold.
-         */
-        if ((o_ptr->tval == TV_ROD) ||
-            (o_ptr->tval == TV_WAND) ||
-            (o_ptr->tval == TV_STAFF))
-        {
-                i_ptr->pval = o_ptr->pval * amt / o_ptr->number;
+        /* Get a copy of the object representing the number being sold */
+        object_copy_amt(i_ptr, object_from_item_idx(item), amt);
+
+        if (!store_check_num(this_store, i_ptr))
+        {
+                store_flags |= STORE_KEEP_PROMPT;
+
+                if (this_store == STORE_HOME)
+                        msg_print("Your home is full.");
+
+                else
+                        msg_print("I have not the room in my store to keep it.");
+
+                return;
         }
 
@@ -2281 +2559 @@
         object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
 
-
-        /* Is there room in the store (or the home?) */
-        if (!store_check_num(store_current, i_ptr))
-        {
-                store_flags |= STORE_KEEP_PROMPT;
-
-                if (store_current == STORE_HOME)
-                        msg_print("Your home is full.");
-
-                else
-                        msg_print("I have not the room in my store to keep it.");
-
-                return;
-        }
-
-
         /* Real store */
-        if (store_current != STORE_HOME)
-        {
-                u32b price, dummy, value;
-
+        if (this_store != STORE_HOME)
+        {
                 /* Extract the value of the items */
-                price = price_item(i_ptr, TRUE, amt);
+                u32b price = price_item(i_ptr, TRUE, amt);
 
                 screen_save();
@@ -2319 +2579 @@
                 screen_load();
 
-                /* Get some money */
-                p_ptr->au += price;
-
-                /* Update the display */
-                store_flags |= STORE_GOLD_CHANGE;
-
-                /* Identify original object */
-                object_aware(o_ptr);
-                object_known(o_ptr);
-
-                /* Update the auto-history if selling an artifact that was previously un-IDed. (Ouch!) */
-                if (artifact_p(o_ptr))
-                        history_add_artifact(o_ptr->name1, TRUE);
-
-                /* Combine / Reorder the pack (later) */
-                p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-                /* Redraw stuff */
-                p_ptr->redraw |= (PR_INVEN | PR_EQUIP);
-
-                /* The object belongs to the store now */
-                i_ptr->ident |= IDENT_STORE;
-
-                /* Get the "apparent" value */
-                dummy = object_value(i_ptr, i_ptr->number);
-
-                /* Get local object */
-                i_ptr = &object_type_body;
-
-                /* Get a copy of the object */
-                object_copy(i_ptr, o_ptr);
-
-                /* Modify quantity */
-                i_ptr->number = amt;
-
-                /*
-                 * Hack -- Allocate charges between those wands, staves, or rods
-                 * sold and retained, unless all are being sold.
-                 */
-                distribute_charges(o_ptr, i_ptr, amt);
-
-                /* Get the "actual" value */
-                value = object_value(i_ptr, i_ptr->number);
-
-                /* Get the description all over again */
-                object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
-
-                /* Describe the result (in message buffer) */
-                msg_format("You sold %s (%c) for %ld gold.",
-                           o_name, index_to_label(item), (long)price);
+                cmd_insert(CMD_SELL, item, amt);
+
                 store_flags |= STORE_KEEP_PROMPT;
-
-                /* Analyze the prices (and comment verbally) */
-                purchase_analyze(price, value, dummy);
-
-                /* Set squelch flag */
-                p_ptr->notice |= PN_SQUELCH;
-
-                /* Take the object from the player */
-                inven_item_increase(item, -amt);
-                inven_item_optimize(item);
-
-                /* Handle stuff */
-                handle_stuff();
-
-                /* The store gets that (known) object */
-                store_carry(store_current, i_ptr);
         }
 
@@ -2391 +2587 @@
         else
         {
-                /* Distribute charges of wands/staves/rods */
-                distribute_charges(o_ptr, i_ptr, amt);
-
-                /* Describe */
-                msg_format("You drop %s (%c).", o_name, index_to_label(item));
-                store_flags |= STORE_KEEP_PROMPT;
-
-                /* Take it from the players inventory */
-                inven_item_increase(item, -amt);
-                inven_item_optimize(item);
-
-                /* Handle stuff */
-                handle_stuff();
-
-                /* Let the home carry it */
-                home_carry(i_ptr);
-        }
-
-        event_signal(EVENT_INVENTORY);
-        event_signal(EVENT_EQUIPMENT);
+                cmd_insert(CMD_STASH, item, amt);
+        }
 }
 
@@ -2419 +2597 @@
 static void store_examine(int item)
 {
-        store_type *st_ptr = &store[store_current];
+        store_type *st_ptr = &store[current_store()];
         object_type *o_ptr;
         bool info_known;
@@ -2439 +2617 @@
         /* Show full info in most stores, but normal info in player home */
         info_known = object_info(o_ptr,
-                        (store_current != STORE_HOME) ? TRUE : FALSE);
+                        (current_store() != STORE_HOME) ? TRUE : FALSE);
 
         if (!info_known)
@@ -2461 +2639 @@
  * Flee the store when it overflows.
  */
-bool store_overflow(void)
+static bool store_overflow(void)
 {
         int item = INVEN_PACK;
@@ -2468 +2646 @@
 
         /* Flee from the store */
-        if (store_current != STORE_HOME)
+        if (current_store() != STORE_HOME)
         {
                 /* Leave */
@@ -2476 +2654 @@
 
         /* Flee from the home */
-        else if (!store_check_num(store_current, o_ptr))
+        else if (!store_check_num(current_store(), o_ptr))
         {
                 /* Leave */
@@ -2535 +2713 @@
         bool equip_toggle = FALSE;
         bool redraw = FALSE;
+        bool command_processed = FALSE;
 
         /* Parse the command */
@@ -2542 +2721 @@
                 case ESCAPE:
                 {
-                        return TRUE;
+                        command_processed = TRUE;
                         break;
                 }
@@ -2551 +2730 @@
                 {
                         store_sell();
-                        return TRUE;
+                        command_processed = TRUE;
+                        break;
                 }
 
@@ -2559 +2739 @@
                 {
                         /* On successful purchase, redraw */
-                        if (store_purchase(oid))
-                                return TRUE;
-
+                        command_processed = store_purchase(oid);
                         break;
                 }
@@ -2579 +2757 @@
                         Term_clear();
                         store_flags |= (STORE_FRAME_CHANGE | STORE_GOLD_CHANGE);
-                        return TRUE;
-
+                        command_processed = TRUE;
                         break;
                 }
@@ -2713 +2890 @@
                         store_flags |= STORE_INIT_CHANGE;
 
-                        return TRUE;
+                        command_processed = TRUE;
+                        break;
                 }
 
@@ -2762 +2940 @@
         }
         
-        return TRUE;
-}
-
+        return command_processed;
+}
 
 
@@ -2772 +2949 @@
 void do_cmd_store(cmd_code code, cmd_arg args[])
 {
-        int py = p_ptr->py;
-        int px = p_ptr->px;
-
         bool leave = FALSE;
 
+        /* Take note of the store number from the terrain feature */
+        int this_store = current_store();
+
         /* Verify that there is a store */
-        if (!((cave_feat[py][px] >= FEAT_SHOP_HEAD) &&
-              (cave_feat[py][px] <= FEAT_SHOP_TAIL)))
+        if (this_store == STORE_NONE)
         {
                 msg_print("You see no store here.");
                 return;
         }
-
 
         /* Check if we can enter the store */
@@ -2807 +2982 @@
 
 
-        /*** Set up state ***/
-
-        /* XXX Take note of the store number from the terrain feature */
-        store_current = (cave_feat[py][px] - FEAT_SHOP_HEAD);
-
 
 
@@ -2830 +3000 @@
         int cursor = 0;
 
-        store_type *st_ptr = &store[store_current];
+        store_type *st_ptr = &store[this_store];
 
         /* Wipe the menu and set it up */
@@ -2842 +3012 @@
 
         /* Say a friendly hello. */
-        if (store_current != STORE_HOME) prt_welcome(store_owner(store_current));
+        if (this_store != STORE_HOME) 
+                prt_welcome(store_owner(this_store));
 
         /* Loop */