From ee70db5d6a4c06918ae40c5110f2e5390dfc27ea Mon Sep 17 00:00:00 2001 From: dolorous Date: Wed, 23 Apr 2008 14:28:16 +0000 Subject: Remove unused ravenous hunger state, and clean up food state checks a bit more. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4535 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 2 +- crawl-ref/source/enum.h | 3 +-- crawl-ref/source/fight.cc | 8 ++++---- crawl-ref/source/mutation.cc | 2 +- crawl-ref/source/output.cc | 2 +- crawl-ref/source/player.cc | 2 +- crawl-ref/source/religion.cc | 2 +- crawl-ref/source/spl-book.cc | 2 +- crawl-ref/source/spl-cast.cc | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 59da0aa72b..be1cba4bd9 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -932,7 +932,7 @@ static bool _activate_talent(const talent& tal) break; } - if (hungerCheck && you.hunger_state <= HS_STARVING) + if (hungerCheck && you.hunger_state == HS_STARVING) { mpr("You're too hungry."); crawl_state.zero_turns_taken(); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index d08ae846c1..a14f6fc23f 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1235,8 +1235,7 @@ enum holy_word_source_type enum hunger_state // you.hunger_state { - HS_RAVENOUS, // 0: not used within code, really - HS_STARVING, + HS_STARVING, // 0 HS_NEAR_STARVING, HS_VERY_HUNGRY, HS_HUNGRY, diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 7290bb752d..0bf23ee931 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -187,13 +187,13 @@ static int calc_your_to_hit_unarmed(int uattack = UNAT_NO_ATTACK, if (vampiric) { - if (you.hunger_state <= HS_STARVING) + if (you.hunger_state == HS_STARVING) your_to_hit += 2; else if (you.hunger_state < HS_SATIATED) your_to_hit += 1; } } - else if (you.species != SP_VAMPIRE && you.hunger_state <= HS_STARVING) + else if (you.species != SP_VAMPIRE && you.hunger_state == HS_STARVING) your_to_hit -= 3; your_to_hit += slaying_bonus(PWPN_HIT); @@ -1308,7 +1308,7 @@ int melee_attack::player_apply_misc_modifiers(int damage) if (you.duration[DUR_MIGHT] > 1) damage += 1 + random2(10); - if (you.hunger_state <= HS_STARVING && you.species != SP_VAMPIRE) + if (you.species != SP_VAMPIRE && you.hunger_state == HS_STARVING) damage -= random2(5); return (damage); @@ -2677,7 +2677,7 @@ int melee_attack::player_to_hit(bool random_factor) your_to_hit += slaying_bonus(PWPN_HIT); // hunger penalty - if (you.hunger_state <= HS_STARVING) + if (you.hunger_state == HS_STARVING) your_to_hit -= 3; // armour penalty diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index d6bf22527a..78ed61ff6e 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1258,7 +1258,7 @@ formatted_string describe_mutations() } } - if (you.hunger_state <= HS_STARVING) + if (you.hunger_state == HS_STARVING) result += "You do not heal." EOL; else if (you.hunger_state <= HS_HUNGRY) result += "You heal slowly." EOL; diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 714154b502..350ad74706 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -2046,7 +2046,7 @@ std::string _status_mut_abilities() text += "praying, "; if (you.disease && !you.duration[DUR_REGENERATION] - || you.species == SP_VAMPIRE && you.hunger_state <= HS_STARVING) + || you.species == SP_VAMPIRE && you.hunger_state == HS_STARVING) { text += "non-regenerating, "; } diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index f3e83a8c6f..e9eea5b590 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -3510,7 +3510,7 @@ int check_stealth(void) break; case SP_VAMPIRE: // Hungry/bat-form vampires are (much) more stealthy - if (you.hunger_state <= HS_STARVING) + if (you.hunger_state == HS_STARVING) stealth += (you.skills[SK_STEALTH] * 21); else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT || you.hunger_state <= HS_NEAR_STARVING) diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 9b14987e2d..5b044ebd0d 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1305,7 +1305,7 @@ static void _do_god_gift(bool prayed_for) case GOD_ZIN: //jmf: this "good" god will feed you (a la Nethack) - if (you.hunger_state <= HS_STARVING + if (you.hunger_state == HS_STARVING && you.piety >= piety_breakpoint(0)) { god_speaks(you.religion, "Your stomach feels content."); diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 0c0a286a2d..8e29be0076 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -1511,7 +1511,7 @@ int staff_spell( int staff ) food = diff * 5; } - if (food && (you.hunger_state <= HS_STARVING || you.hunger <= food)) + if (food && (you.hunger_state == HS_STARVING || you.hunger <= food)) { mpr("You don't have the energy to cast that spell."); crawl_state.zero_turns_taken(); diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 0e272fe8ae..8acf2495a7 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -664,7 +664,7 @@ bool cast_a_spell() } if (you.is_undead != US_UNDEAD && you.is_undead != US_SEMI_UNDEAD - && (you.hunger_state <= HS_STARVING + && (you.hunger_state == HS_STARVING || you.hunger <= spell_hunger( spell ))) { mpr("You don't have the energy to cast that spell."); -- cgit v1.2.3-54-g00ecf