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/macro.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/macro.cc')
| -rw-r--r-- | crawl-ref/source/macro.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index 60c3e223e3..25e916430f 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -714,8 +714,8 @@ int getch_with_command_macros( void ) */ void flush_input_buffer( int reason ) { - ASSERT(reason != FLUSH_KEY_REPLAY_CANCEL || - crawl_state.is_replaying_keys() || crawl_state.cmd_repeat_start); + ASSERT(reason != FLUSH_KEY_REPLAY_CANCEL + || crawl_state.is_replaying_keys() || crawl_state.cmd_repeat_start); ASSERT(reason != FLUSH_ABORT_MACRO || is_processing_macro()); @@ -725,8 +725,8 @@ void flush_input_buffer( int reason ) macro_keys_left = -1; if (crawl_state.is_replaying_keys() && reason != FLUSH_ABORT_MACRO - && reason != FLUSH_KEY_REPLAY_CANCEL && - reason != FLUSH_REPLAY_SETUP_FAILURE) + && reason != FLUSH_KEY_REPLAY_CANCEL + && reason != FLUSH_REPLAY_SETUP_FAILURE) { return; } |