diff options
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/delay.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/describe.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/effects.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/food.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 6 |
6 files changed, 10 insertions, 11 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 0acfba776d..02b30258c2 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -382,7 +382,7 @@ const std::string make_cost_description( ability_type ability ) ret << " HP"; } - if (abil.food_cost && you.species != SP_MUMMY) + if (abil.food_cost && you.is_undead != US_UNDEAD) { if (!ret.str().empty()) ret << ", "; diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 326fa33151..55cfa4931e 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -390,7 +390,7 @@ void handle_delay( void ) delay.parm2 = 99; // don't give the message twice if (you.species != SP_VAMPIRE - && you.species != SP_MUMMY + && you.is_undead != US_UNDEAD && you.species != SP_GHOUL) { xom_check_corpse_waste(); diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index c0bed567fd..89a43389fe 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2191,7 +2191,7 @@ static std::string describe_food( const item_def &item ) { if (you.species == SP_GHOUL) description += "It looks nice and ripe. "; - else if (you.species != SP_MUMMY) + else if (you.is_undead != US_UNDEAD) { description += "In fact, it is " "rotting away before your eyes. " diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 77e3a93bcc..931f61498f 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1449,6 +1449,7 @@ bool acquirement(object_class_type class_wanted, int agent) case SP_DEMONSPAWN: case SP_MUMMY: case SP_GHOUL: + case SP_VAMPIRE: { int brand = get_weapon_brand( thing ); if (brand == SPWPN_HOLY_WRATH diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 97d5319e7d..ec62aa9370 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -943,7 +943,7 @@ static void ghoul_consume_flesh(int chunk_type) { if (chunk_type == CE_ROTTEN) mpr("This rotting flesh tastes delicious!"); - else // CE_CONTAMINATED or CE_HCL + else // CE_CONTAMINATED mpr("This flesh tastes delicious!"); heal_from_food(hp_amt, 0, @@ -1389,7 +1389,6 @@ bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg, bool reqid, // understood why liches are hungry and not true undead beings ... {dlb}: static int determine_chunk_effect(int which_chunk_type, bool rotten_chunk) { - const int poison_resistance_level = player_res_poison(); int this_chunk_effect = which_chunk_type; // determine the initial effect of eating a particular chunk {dlb}: @@ -1405,9 +1404,8 @@ static int determine_chunk_effect(int which_chunk_type, bool rotten_chunk) break; case CE_POISONOUS: - if (you.species == SP_GHOUL - || you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH - || poison_resistance_level > 0 && you.species != SP_VAMPIRE) + if (you.attribute[ATTR_TRANSFORMATION] == TRAN_LICH + || player_res_poison() > 0 && you.species != SP_VAMPIRE) { this_chunk_effect = CE_CLEAN; } diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 36db3870b1..0903200fed 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -2345,8 +2345,8 @@ static void give_random_scroll( int slot ) static void give_random_potion( int slot ) { - // Mummies can't quaff and don't care - if (you.species == SP_MUMMY) + // If you can't quaff, you don't care + if (you.is_undead == US_UNDEAD) return; you.inv[ slot ].quantity = 1; @@ -3554,7 +3554,7 @@ bool give_items_skills() newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE); - if (you.species != SP_MUMMY) + if (you.is_undead != US_UNDEAD) newgame_make_item(2, EQ_NONE, OBJ_POTIONS, POT_HEALING, 2); you.skills[SK_FIGHTING] = 2; |