diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/mstuff2.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/religion.cc | 9 | ||||
-rw-r--r-- | crawl-ref/source/spells1.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/stuff.cc | 10 |
4 files changed, 10 insertions, 17 deletions
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index 14245a3387..d6be6d1032 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -2315,9 +2315,9 @@ static int _monster_abjuration(const monsters *caster, bool actual) for (int rad = 1; rad < 5 && pow >= 30; ++rad) { int number_hit = - _apply_radius_around_square( caster->pos(), rad, - _monster_abjure_square, - pow, !actual, wont_attack); + _apply_radius_around_square(caster->pos(), rad, + _monster_abjure_square, + pow, !actual, wont_attack); maffected += number_hit; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index a74f75cbcd..ef2b3e277a 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -744,7 +744,7 @@ static void _give_nemelex_gift() // Nemelex will give at least one gift early. if (you.num_gifts[GOD_NEMELEX_XOBEH] == 0 - && random2(piety_breakpoint(1)) < you.piety + && random2(piety_breakpoint(1)) <= you.piety || random2(MAX_PIETY) <= you.piety && one_chance_in(3) && !you.attribute[ATTR_CARD_COUNTDOWN]) { @@ -2598,8 +2598,7 @@ void gain_piety(int pgn) int old_piety = you.piety; you.piety += pgn; - if (you.piety > MAX_PIETY) - you.piety = MAX_PIETY; + you.piety = MIN(MAX_PIETY, you.piety); for ( int i = 0; i < MAX_GOD_ABILITIES; ++i ) { @@ -5453,14 +5452,10 @@ void handle_god_time() you.gift_timeout = 0; } else if (you.gift_timeout > 1) - { you.gift_timeout -= random2(2); - } if (one_chance_in(20)) - { xom_acts(abs(you.piety - 100)); - } break; } diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 3a804ce805..b08c12e433 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -1259,7 +1259,7 @@ void abjuration(int pow) simple_monster_message(monster, " shudders."); } } -} // end abjuration() +} // Antimagic is sort of an anti-extension... it sets a lot of magical // durations to 1 so it's very nasty at times (and potentially lethal, diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 92ba9294ec..bebf74d937 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -806,25 +806,23 @@ void modify_all_stats(int STmod, int IQmod, int DXmod) { you.strength += STmod; you.max_strength += STmod; - you.redraw_strength = 1; + you.redraw_strength = true; } if (IQmod) { you.intel += IQmod; you.max_intel += IQmod; - you.redraw_intelligence = 1; + you.redraw_intelligence = true; } if (DXmod) { you.dex += DXmod; you.max_dex += DXmod; - you.redraw_dexterity = 1; + you.redraw_dexterity = true; } - - return; -} // end modify_stat() +} void canned_msg(canned_message_type which_message) { |