summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-02-22 19:37:43 -0700
committerSteve Melenchuk <smelenchuk@gmail.com>2014-02-27 10:53:32 -0700
commite4bcf1a21e404703ebabf4b7d02777b88a5bcd5c (patch)
tree3471bd2be80e0c461c47dccaf8414a97969517e4 /crawl-ref/source/misc.cc
parent600e0b529ee429d4b770d9afe36346ccbd9767bd (diff)
downloadcrawl-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/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 298d95cfd5..bb013675bf 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1637,13 +1637,12 @@ static const char *shop_types[] =
"antique armour",
"antiques",
"jewellery",
- "wand",
+ "gadget",
"book",
"food",
"distillery",
"scroll",
"general",
- "gadget"
};
int str_to_shoptype(const string &s)