diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-06-12 01:36:41 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-06-12 15:10:27 +0200 |
| commit | fea71b51790dfb1c5babc22c32226a976a1d5fde (patch) | |
| tree | eca851da1ea35080a389d0c7548a57a167b14b74 /crawl-ref/source/l_item.cc | |
| parent | 13f14d0f7d75f1164c1ba97fc38272f8dc6b441a (diff) | |
| download | crawl-ref-fea71b51790dfb1c5babc22c32226a976a1d5fde.tar.gz crawl-ref-fea71b51790dfb1c5babc22c32226a976a1d5fde.zip | |
Make staves and rods separate object classes.
They have about no overlap, more than both being usable as weapons. A vast
majority of uses immediately checked item_is_rod()/item_is_staff().
I kept them shared for acquirement, for now.
Also, eliminate rods of smiting -- hardly ever used, problematic theme-wise
as they use "divine providence" without worship. Keeping rods of striking
for now, could be used to fix artificer problems. Adding/removing rod enums
is a mess due to tile handling, renaming ROD_SMITING to ROD_LIGHTNING for now.
Diffstat (limited to 'crawl-ref/source/l_item.cc')
| -rw-r--r-- | crawl-ref/source/l_item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc index e5ad21410e..a42133ed31 100644 --- a/crawl-ref/source/l_item.cc +++ b/crawl-ref/source/l_item.cc @@ -469,7 +469,7 @@ IDEF(equip_type) equipment_type eq = EQ_NONE; - if (item->base_type == OBJ_WEAPONS || item->base_type == OBJ_STAVES) + if (is_weapon(*item)) eq = EQ_WEAPON; else if (item->base_type == OBJ_ARMOUR) eq = get_armour_slot(*item); |