summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilepick-p.cc
diff options
context:
space:
mode:
authorelliptic <hyperelliptical@gmail.com>2012-09-02 15:13:17 -0400
committerelliptic <hyperelliptical@gmail.com>2012-09-02 15:13:17 -0400
commit9dd2245c47711c143e5e5dd0ab5fe51047e55df2 (patch)
tree18af5bd5b39da197555fdc73f2eaac6c1865adc6 /crawl-ref/source/tilepick-p.cc
parentc32969eddd6e2420ae7d52bd410bf9f0a3b4d05a (diff)
downloadcrawl-ref-9dd2245c47711c143e5e5dd0ab5fe51047e55df2.tar.gz
crawl-ref-9dd2245c47711c143e5e5dd0ab5fe51047e55df2.zip
Remove generation of "staff" items.
Nobody ever wanted to use one, and the distinction between club/staff/quarterstaff didn't make much sense. Artificers now start with a short sword instead, the same as hunters. WPN_STAFF is still present in the code to provide the weapon stats for magical staves.
Diffstat (limited to 'crawl-ref/source/tilepick-p.cc')
-rw-r--r--crawl-ref/source/tilepick-p.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc
index 944be34223..b46c1683af 100644
--- a/crawl-ref/source/tilepick-p.cc
+++ b/crawl-ref/source/tilepick-p.cc
@@ -129,7 +129,9 @@ tileidx_t tilep_equ_weapon(const item_def &item)
case WPN_SPEAR: return TILEP_HAND1_SPEAR;
case WPN_HALBERD: return TILEP_HAND1_HALBERD;
case WPN_GLAIVE: return TILEP_HAND1_GLAIVE;
+#if TAG_MAJOR_VERSION == 34
case WPN_STAFF: return TILEP_HAND1_STAFF;
+#endif
case WPN_QUARTERSTAFF: return TILEP_HAND1_QUARTERSTAFF1;
case WPN_LAJATANG:
return tileidx_enchant_equ(item, TILEP_HAND1_LAJATANG, true);