diff options
| -rw-r--r-- | crawl-ref/source/decks.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/delay.cc | 12 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index aca8099098..6e639692b8 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1059,7 +1059,7 @@ static void trowel_card(int power, deck_rarity_type rarity) } if ( !done_stuff ) - mprf("Nothing appears to happen.", power_level); + mpr("Nothing appears to happen."); return; } diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index e35f1c82b8..ea9be8acf5 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -563,20 +563,20 @@ static void finish_delay(const delay_queue_item &delay) if (is_valid_item(item) && item.base_type == OBJ_CORPSES) { mprf("You finish %s the corpse into pieces.", - (you.species==SP_TROLL || you.species == SP_GHOUL + (you.species == SP_TROLL || you.species == SP_GHOUL || you.mutation[MUT_FANGS] == 3) ? "ripping" : "chopping"); - if (you.species == SP_VAMPIRE && (!you.duration[DUR_PRAYER] - || you.religion != GOD_MAKHLEB && you.religion != GOD_TROG - && you.religion != GOD_OKAWARU && you.religion != GOD_BEOGH - && you.religion != GOD_LUGONU)) + if (you.species == SP_VAMPIRE && + (!god_likes_butchery(you.religion) || + !you.duration[DUR_PRAYER])) { mpr("What a waste."); } turn_corpse_into_chunks( mitm[ delay.parm1 ] ); - if (you.duration[DUR_BERSERKER] && you.berserk_penalty != NO_BERSERK_PENALTY) + if (you.duration[DUR_BERSERKER] && + you.berserk_penalty != NO_BERSERK_PENALTY) { mpr("You enjoyed that."); you.berserk_penalty = 0; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 4ebae224b4..8ee2179dc0 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2484,7 +2484,7 @@ static bool god_likes_items(god_type god) return false; case GOD_NO_GOD: case NUM_GODS: case GOD_RANDOM: - mprf("Bad god, no biscuit! %d", static_cast<int>(god) ); + mprf(MSGCH_DANGER, "Bad god, no biscuit! %d", static_cast<int>(god) ); return false; } return false; @@ -2691,9 +2691,9 @@ void god_pitch(god_type which_god) bool god_likes_butchery(god_type god) { - return (you.religion == GOD_OKAWARU || you.religion == GOD_MAKHLEB || - you.religion == GOD_TROG || you.religion == GOD_BEOGH || - you.religion == GOD_LUGONU); + return (god == GOD_OKAWARU || god == GOD_MAKHLEB || + god == GOD_TROG || god == GOD_BEOGH || + god == GOD_LUGONU); } bool god_hates_butchery(god_type god) |