* Allow fleeing monster to push past higher ranked monsters of the same

  type.
* Allow quivering of wielded missiles (stones for Sandblast etc.) and
  wielded weapons of returning if your throwing skill is > 0.
* Add stairs/gates/shops to the 'V' command, mostly for the convenience
  of the easy travel feature.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9574 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 7 deletions

diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index caa4eed7d5..0b1002c5e3 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -908,7 +908,7 @@ void ShopInfo::describe_shop_item(const shop_item &si) const
     item_def it = static_cast<item_def>(si.item);
     describe_item( it );
 
-    if ( oldflags != si.item.flags )
+    if (oldflags != si.item.flags)
         const_cast<shop_item&>(si).item.flags = oldflags;
 }
 
@@ -920,7 +920,7 @@ public:
                   menu_letter hotkey) : InvEntry(it.item)
     {
         text = item_name;
-        add_hotkey(hotkey);
+        hotkeys[0] = hotkey;
     }
 };
 
@@ -930,8 +930,8 @@ bool ShopInfo::show_menu(const std::string &place,
     StashMenu menu;
 
     MenuEntry *mtitle = new MenuEntry(name + " (" + place, MEL_TITLE);
-    menu.can_travel = can_travel;
-    mtitle->quantity = items.size();
+    menu.can_travel   = can_travel;
+    mtitle->quantity  = items.size();
     menu.set_title(mtitle);
 
     menu_letter hotkey;
@@ -949,9 +949,9 @@ bool ShopInfo::show_menu(const std::string &place,
     {
         for (int i = 0, count = items.size(); i < count; ++i)
         {
-            MenuEntry *me = new ShopItemEntry(items[i],
-                                              shop_item_name(items[i]),
-                                              hotkey++);
+            ShopItemEntry *me = new ShopItemEntry(items[i],
+                                                  shop_item_name(items[i]),
+                                                  hotkey++);
             menu.add_entry(me);
         }
     }