diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-21 12:37:25 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-21 12:37:25 -0600 |
| commit | 4277eaea5e02fb69d64193a0395357e2c346afdb (patch) | |
| tree | 68806b639fbb4d2e08215b12517c86c2eee0fe94 /crawl-ref/source/delay.cc | |
| parent | 505571294e7ca02c0af89ff2b25f3cecde439448 (diff) | |
| download | crawl-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/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index d11b54bc6d..ff8585be12 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -124,9 +124,9 @@ static int _recite_to_monsters(coord_def where, int pow, int, actor *) if (one_chance_in(resist + 1)) return (0); // nothing happens, whew! - if (!one_chance_in(4) && - mon->add_ench(mon_enchant(ENCH_HASTE, 0, KC_YOU, - (16 + random2avg(13, 2)) * 10))) + if (!one_chance_in(4) + && mon->add_ench(mon_enchant(ENCH_HASTE, 0, KC_YOU, + (16 + random2avg(13, 2)) * 10))) { simple_monster_message(mon, " speeds up in annoyance!"); @@ -2008,10 +2008,11 @@ bool interrupt_activity( activity_interrupt_type ai, // so that stop running Lua notifications happen. for (int j = i; j < size; ++j) { - if (is_run_delay( you.delay_queue[j].type )) + if (is_run_delay(you.delay_queue[j].type)) { - was_monst = was_monst || - _monster_warning(ai, at, you.delay_queue[j].type); + was_monst = (was_monst + || _monster_warning(ai, at, + you.delay_queue[j].type)); stop_delay(ai == AI_TELEPORT); if (was_monst) @@ -2021,8 +2022,8 @@ bool interrupt_activity( activity_interrupt_type ai, } // Non-run queued delays can be discarded without any processing. - you.delay_queue.erase( you.delay_queue.begin() + i, - you.delay_queue.end() ); + you.delay_queue.erase(you.delay_queue.begin() + i, + you.delay_queue.end()); if (was_monst) handle_interrupted_swap(false, true); |