summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 2f6e1bf7b3..08a2308201 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -3461,10 +3461,10 @@ static void _catchup_monster_moves(monsters *mon, int turns)
const int moves = (range > 50) ? 50 : range;
// const bool short_time = (range >= 5 + random2(10));
- const bool long_time = (range >= (500 + roll_dice( 2, 500 )));
+ const bool long_time = (range >= (500 + roll_dice(2, 500)));
- const bool ranged_attack = (mons_has_ranged_spell( mon, true )
- || mons_has_ranged_attack( mon ));
+ const bool ranged_attack = (mons_has_ranged_spell(mon, true)
+ || mons_has_ranged_attack(mon));
#if DEBUG_DIAGNOSTICS
// probably too annoying even for DEBUG_DIAGNOSTICS
@@ -3529,7 +3529,7 @@ static void _catchup_monster_moves(monsters *mon, int turns)
}
else
{
- shift_monster( mon, mon->pos() );
+ shift_monster(mon, mon->pos());
#if DEBUG_DIAGNOSTICS
mprf(MSGCH_DIAGNOSTICS, "shifted to (%d,%d)",
@@ -3551,7 +3551,6 @@ static void _catchup_monster_moves(monsters *mon, int turns)
if (pos.x + inc.x < 0 || pos.x + inc.x >= GXM)
inc.x = 0;
-
if (pos.y + inc.y < 0 || pos.y + inc.y >= GYM)
inc.y = 0;
@@ -3574,7 +3573,7 @@ static void _catchup_monster_moves(monsters *mon, int turns)
shift_monster(mon, mon->pos());
#if DEBUG_DIAGNOSTICS
- mprf(MSGCH_DIAGNOSTICS, "moved to (%d,%d)", mon->pos().x, mon->pos().y );
+ mprf(MSGCH_DIAGNOSTICS, "moved to (%d, %d)", mon->pos().x, mon->pos().y);
#endif
}