diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-10 21:25:11 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-10 21:25:11 +0000 |
commit | 9020068a7cd2e62822fb32a2d54b60fe3ec27b35 (patch) | |
tree | fad885868a790e4f1371f21f204b35b6d3ba6e0d /crawl-ref/source/item_use.cc | |
parent | 1e79812dc4bcc00f7a00164300ff19f38abc0cc9 (diff) | |
download | crawl-ref-9020068a7cd2e62822fb32a2d54b60fe3ec27b35.tar.gz crawl-ref-9020068a7cd2e62822fb32a2d54b60fe3ec27b35.zip |
Helmets, helms, caps and wizard hats now have their own subtypes, as
opposed to the old model where they had subtype ARM_HELMET.
Breaks savefiles, might be buggy.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3035 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 6abc5a71ea..894a1723bf 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -845,9 +845,7 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) // it fits return (true); } - else if (sub_type == ARM_HELMET - && (get_helmet_type(item) == THELM_CAP - || get_helmet_type(item) == THELM_WIZARD_HAT)) + else if (sub_type == ARM_CAP || sub_type == ARM_WIZARD_HAT) { // caps & wiz hats always fit return (true); @@ -881,9 +879,7 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) || (sub_type >= ARM_GLOVES && sub_type <= ARM_BUCKLER) || sub_type == ARM_CRYSTAL_PLATE_MAIL - || (sub_type == ARM_HELMET - && (get_helmet_type(item) == THELM_HELM - || get_helmet_type(item) == THELM_HELMET))) + || is_hard_helmet(item)) { if (verbose) mpr("This armour doesn't fit on your body."); @@ -902,9 +898,7 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary) || sub_type == ARM_SHIELD || sub_type == ARM_LARGE_SHIELD || sub_type == ARM_CRYSTAL_PLATE_MAIL - || (sub_type == ARM_HELMET - && (get_helmet_type(item) == THELM_HELM - || get_helmet_type(item) == THELM_HELMET))) + || is_hard_helmet(item)) { if (verbose) mpr("This armour doesn't fit on your body."); |