summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-21 12:37:25 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-21 12:37:25 -0600
commit4277eaea5e02fb69d64193a0395357e2c346afdb (patch)
tree68806b639fbb4d2e08215b12517c86c2eee0fe94 /crawl-ref/source/beam.cc
parent505571294e7ca02c0af89ff2b25f3cecde439448 (diff)
downloadcrawl-ref-4277eaea5e02fb69d64193a0395357e2c346afdb.tar.gz
crawl-ref-4277eaea5e02fb69d64193a0395357e2c346afdb.zip
Add formatting fixes.
This mostly puts && and || on the proper lines, per the style guide.
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index f76b053ffc..e18360be8a 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4781,8 +4781,8 @@ void bolt::affect_monster(monsters* mon)
}
// Missiles go past bushes.
- if (mon->type == MONS_BUSH && !is_beam && !is_explosion &&
- (flavour == BEAM_MISSILE || flavour == BEAM_MMISSILE))
+ if (mon->type == MONS_BUSH && !is_beam && !is_explosion
+ && (flavour == BEAM_MISSILE || flavour == BEAM_MMISSILE))
{
apply_hit_funcs(mon, 0);
return;