diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-13 03:10:01 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-13 03:10:01 +0000 |
| commit | b387e5b77f4ceb3f64cad79d7cd3ebdc7ccb188d (patch) | |
| tree | 7758235b6fa1fd67fa8e57682fc24f17f7ed4597 /crawl-ref/source/mstuff2.cc | |
| parent | 54f997488c136eeb0a6baae3c373d3c2dc3976c2 (diff) | |
| download | crawl-ref-b387e5b77f4ceb3f64cad79d7cd3ebdc7ccb188d.tar.gz crawl-ref-b387e5b77f4ceb3f64cad79d7cd3ebdc7ccb188d.zip | |
Add minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5771 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mstuff2.cc')
| -rw-r--r-- | crawl-ref/source/mstuff2.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index 75e48d46df..14245a3387 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -48,7 +48,7 @@ #include "traps.h" #include "view.h" -static int _monster_abjuration(const monsters *mons, bool test); +static int _monster_abjuration(const monsters *mons, bool actual); // NB: only works because grid location already verified // to be some sort of trap prior to function call: {dlb} @@ -433,10 +433,10 @@ void mons_trap(struct monsters *monster) static bool _mons_abjured(monsters *monster, bool nearby) { - if (nearby && _monster_abjuration(monster, true) > 0 + if (nearby && _monster_abjuration(monster, false) > 0 && coinflip()) { - _monster_abjuration(monster, false); + _monster_abjuration(monster, true); return (true); } @@ -2301,12 +2301,12 @@ static int _apply_radius_around_square( const coord_def &c, int radius, return (res); } -static int _monster_abjuration(const monsters *caster, bool test) +static int _monster_abjuration(const monsters *caster, bool actual) { const bool wont_attack = mons_wont_attack(caster); int maffected = 0; - if (!test) + if (actual) mpr("Send 'em back where they came from!"); int pow = std::min(caster->hit_dice * 90, 2500); @@ -2317,7 +2317,7 @@ static int _monster_abjuration(const monsters *caster, bool test) int number_hit = _apply_radius_around_square( caster->pos(), rad, _monster_abjure_square, - pow, test, wont_attack); + pow, !actual, wont_attack); maffected += number_hit; |