diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-09 11:47:31 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-09 11:47:31 +0000 |
| commit | 197e914235a08d505781e2b75b69998e8452b051 (patch) | |
| tree | 3f210bd84aa8b4c1e5aaf5d48c3773601a211bce /crawl-ref/source/item_use.cc | |
| parent | 536cad41f666433204c1072afe2c3aa5c93c4d64 (diff) | |
| download | crawl-ref-197e914235a08d505781e2b75b69998e8452b051.tar.gz crawl-ref-197e914235a08d505781e2b75b69998e8452b051.zip | |
Transformation cleanup.
Fixed a bad bug in cloak/body armour wearing interaction (oops.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1813 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 19a2d3b747..34ee576593 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -726,7 +726,7 @@ bool do_wear_armour( int item, bool quiet ) return (false); } - const int base_type = you.inv[item].base_type; + const object_class_type base_type = you.inv[item].base_type; if (base_type != OBJ_ARMOUR) { if (!quiet) @@ -884,8 +884,8 @@ bool do_wear_armour( int item, bool quiet ) if (slot == EQ_BODY_ARMOUR && you.equip[EQ_CLOAK] != -1 && !cloak_is_being_removed()) { - if ( you.equip[EQ_BODY_ARMOUR] && - item_cursed(you.inv[you.equip[EQ_BODY_ARMOUR]]) ) + if (you.equip[EQ_BODY_ARMOUR] != -1 && + item_cursed(you.inv[you.equip[EQ_BODY_ARMOUR]]) ) { if ( !quiet ) mprf("%s is stuck to your body!", |