diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-06 15:40:17 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-06 15:40:17 +0000 |
| commit | 2e8e0ffb7fae1ac6acf35e941153f697edcd1ac3 (patch) | |
| tree | 6028c470764e2621fc3ee58ece265a1676e0f7cf /crawl-ref/source | |
| parent | aab6e642f58f5361a6a941ce5d5a750e11b7d2e6 (diff) | |
| download | crawl-ref-2e8e0ffb7fae1ac6acf35e941153f697edcd1ac3.tar.gz crawl-ref-2e8e0ffb7fae1ac6acf35e941153f697edcd1ac3.zip | |
Fix 1845534 (bad naming for brands.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3013 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/effects.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/itemname.cc | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index bb45b4ad98..261670698a 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -861,8 +861,8 @@ static int find_acquirement_subtype(object_class_type class_wanted, type_wanted = (coinflip()) ? OBJ_RANDOM : ARM_SHIELD + random2(5); // mutation specific problems (horns allow caps) - if (type_wanted == ARM_BOOTS && !player_has_feet() - || you.has_claws(false) >= 3 && type_wanted == ARM_GLOVES) + if ((type_wanted == ARM_BOOTS && !player_has_feet()) + || (you.has_claws(false) >= 3 && type_wanted == ARM_GLOVES)) { type_wanted = OBJ_RANDOM; } @@ -1396,10 +1396,6 @@ bool acquirement(object_class_type class_wanted, int agent) // easier to read this way item_def& thing(mitm[thing_created]); - // give some more gold - if ( class_wanted == OBJ_GOLD ) - thing.quantity += 150; - // remove curse flag from item do_uncurse_item( thing ); diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 61c6198176..5d6413734d 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -606,7 +606,7 @@ void wield_effects(int item_wield_2, bool showMsgs) switch (i_dam) { case SPWPN_PROTECTION: - you.redraw_armour_class = 1; + you.redraw_armour_class = true; break; case SPWPN_DISTORTION: diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index bc56985edc..56c6dd2c6b 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -984,7 +984,11 @@ std::string item_def::name_aux( description_level_type desc, !basename && !qualname && !dbname && (ident || item_ident(*this, ISFLAG_KNOW_PLUSES)); - const bool know_brand = ident && !basename && !qualname && !dbname; + const bool know_brand = + !basename && !qualname && !dbname + && !testbits(ignore_flags, ISFLAG_KNOW_PROPERTIES) + && (ident || item_ident(*this, ISFLAG_KNOW_PROPERTIES)); + const bool know_ego = know_brand; const bool know_cosmetic = !__know_pluses && !terse & !basename |