diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-02-22 19:37:43 -0700 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-02-27 10:53:32 -0700 |
| commit | e4bcf1a21e404703ebabf4b7d02777b88a5bcd5c (patch) | |
| tree | 3471bd2be80e0c461c47dccaf8414a97969517e4 /crawl-ref/source/shopping.cc | |
| parent | 600e0b529ee429d4b770d9afe36346ccbd9767bd (diff) | |
| download | crawl-ref-e4bcf1a21e404703ebabf4b7d02777b88a5bcd5c.tar.gz crawl-ref-e4bcf1a21e404703ebabf4b7d02777b88a5bcd5c.zip | |
Merge wand and gadget shops (and allow them to occasionally have rods).
Get all your evokables in once place, folks!
Diffstat (limited to 'crawl-ref/source/shopping.cc')
| -rw-r--r-- | crawl-ref/source/shopping.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index 8574cb0420..60b3d946a5 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -2214,8 +2214,8 @@ static string _shop_type_name(shop_type type) return "Armour"; case SHOP_JEWELLERY: return "Jewellery"; - case SHOP_WAND: - return "Magical Wand"; + case SHOP_EVOKABLES: + return "Gadget"; case SHOP_BOOK: return "Book"; case SHOP_FOOD: @@ -2228,8 +2228,6 @@ static string _shop_type_name(shop_type type) return "Distillery"; case SHOP_GENERAL: return "General Store"; - case SHOP_MISCELLANY: - return "Gadget"; default: return "Bug"; } |