From 4277eaea5e02fb69d64193a0395357e2c346afdb Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sat, 21 Nov 2009 12:37:25 -0600 Subject: Add formatting fixes. This mostly puts && and || on the proper lines, per the style guide. --- crawl-ref/source/mon-cast.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/mon-cast.cc') diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index 30bc323ef5..17d4faa140 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -2075,14 +2075,23 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, // we can blink away the crowd, but only our allies if (monster_at(*ai) && monster_at(*ai)->attitude != monster->attitude) + { sumcount++; + } + if (grd(*ai) != DNGN_FLOOR && grd(*ai) > DNGN_MAX_NONREACH && !feat_is_trap(grd(*ai))) + { sumcount++; + } } - if (abs(you.pos().x-monster->pos().x)<=1 && - abs(you.pos().y-monster->pos().y)<=1) + + if (abs(you.pos().x - monster->pos().x) <= 1 + && abs(you.pos().y - monster->pos().y) <= 1) + { sumcount++; + } + if (sumcount) { monster->blink(); -- cgit v1.2.3-54-g00ecf