summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/state.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/state.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/state.cc')
-rw-r--r--crawl-ref/source/state.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc
index 172383cba6..59f5e1188a 100644
--- a/crawl-ref/source/state.cc
+++ b/crawl-ref/source/state.cc
@@ -338,8 +338,8 @@ void game_state::inc_god_acting(god_type which_god, bool is_retribution)
{
ASSERT(which_god != GOD_NO_GOD);
- if (god_act.which_god != GOD_NO_GOD &&
- god_act.which_god != which_god)
+ if (god_act.which_god != GOD_NO_GOD
+ && god_act.which_god != which_god)
{
ASSERT(god_act.depth >= 1);