summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-22 23:38:11 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-22 23:38:11 +0000
commitf91be6a2f75a489fbacbeb147d67186ff9249a1e (patch)
treecb3b6b736b0933a3ea698ab8453dfa85389d42cd /crawl-ref/source/beam.cc
parent7adf2d18d2d3ea426a4724f2672e291630e26cba (diff)
downloadcrawl-ref-f91be6a2f75a489fbacbeb147d67186ff9249a1e.tar.gz
crawl-ref-f91be6a2f75a489fbacbeb147d67186ff9249a1e.zip
Add minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5184 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 99c87eac7b..e991debc23 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4238,7 +4238,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
// naughty (even if a monster might resist).
if (nasty_beam(mon, beam))
{
- if (YOU_KILL( beam.thrower ))
+ if (YOU_KILL(beam.thrower))
{
if (is_sanctuary(mon->x, mon->y)
|| is_sanctuary(you.x_pos, you.y_pos))
@@ -4269,12 +4269,10 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
}
}
- behaviour_event( mon, ME_ANNOY, _beam_source(beam) );
+ behaviour_event(mon, ME_ANNOY, _beam_source(beam));
}
else
- {
- behaviour_event( mon, ME_ALERT, _beam_source(beam) );
- }
+ behaviour_event(mon, ME_ALERT, _beam_source(beam));
conduct.enabled = true;
@@ -4477,7 +4475,7 @@ static int _affect_monster(bolt &beam, monsters *mon, item_def *item)
// Don't annoy friendlies or good neutrals if the player's beam
// did no damage. Hostiles will still take umbrage.
if (hurt_final > 0 || !mons_wont_attack(mon) || !YOU_KILL(beam.thrower))
- behaviour_event(mon, ME_ANNOY, _beam_source(beam) );
+ behaviour_event(mon, ME_ANNOY, _beam_source(beam));
}
// explosions always 'hit'
@@ -5433,8 +5431,11 @@ bool nasty_beam(monsters *mon, bolt &beam)
return (mons_holiness(mon) == MH_NATURAL);
// dispel undead / control undead
- if (beam.flavour == BEAM_DISPEL_UNDEAD || beam.flavour == BEAM_ENSLAVE_UNDEAD)
+ if (beam.flavour == BEAM_DISPEL_UNDEAD
+ || beam.flavour == BEAM_ENSLAVE_UNDEAD)
+ {
return (mons_holiness(mon) == MH_UNDEAD);
+ }
// pain/agony
if (beam.flavour == BEAM_PAIN)