diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-08 23:13:47 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-08 23:13:47 +0000 |
commit | 88c3d55edbc70cf7da43226902a3f730f7481f28 (patch) | |
tree | f94b8abba4d19c1479c9e1311b666697f8cc4cfb | |
parent | c5a784f95ea94be383dc49f12f5aea1b738b6d65 (diff) | |
download | crawl-ref-88c3d55edbc70cf7da43226902a3f730f7481f28.tar.gz crawl-ref-88c3d55edbc70cf7da43226902a3f730f7481f28.zip |
Add still more whitespace fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4155 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/acr.cc | 26 | ||||
-rw-r--r-- | crawl-ref/source/it_use2.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/message.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/stuff.cc | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 39f77054b2..89d6fcc0a1 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1431,7 +1431,7 @@ static void _input() crawl_state.waiting_for_command = true; c_input_reset(true); - + const command_type cmd = _get_next_cmd(); crawl_state.waiting_for_command = false; @@ -1484,60 +1484,60 @@ static void _input() { PlaceInfo& curr_PlaceInfo = you.get_place_info(); PlaceInfo delta; - + delta.turns_total++; delta.elapsed_total += you.time_taken; - + switch(you.running) { case RMODE_INTERLEVEL: delta.turns_interlevel++; delta.elapsed_interlevel += you.time_taken; break; - + case RMODE_EXPLORE_GREEDY: case RMODE_EXPLORE: delta.turns_explore++; delta.elapsed_explore += you.time_taken; break; - + case RMODE_TRAVEL: delta.turns_travel++; delta.elapsed_travel += you.time_taken; break; - + default: // prev_was_rest is needed so that the turn in which // a player is interrupted from resting is counted // as a resting turn, rather than "other". static bool prev_was_rest = false; - + if (!you.delay_queue.empty() && you.delay_queue.front().type == DELAY_REST) prev_was_rest = true; - + if (prev_was_rest) { delta.turns_resting++; delta.elapsed_resting += you.time_taken; - + } else { delta.turns_other++; delta.elapsed_other += you.time_taken; } - + if (you.delay_queue.empty() || you.delay_queue.front().type != DELAY_REST) prev_was_rest = false; - + break; } - + you.global_info += delta; you.global_info.assert_validity(); - + curr_PlaceInfo += delta; curr_PlaceInfo.assert_validity(); } diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc index a22363946f..6093cb0577 100644 --- a/crawl-ref/source/it_use2.cc +++ b/crawl-ref/source/it_use2.cc @@ -441,7 +441,7 @@ bool unwield_item(bool showMsgs) if (brand != SPWPN_NORMAL) { const std::string msg = item.name(DESC_CAP_YOUR); - + switch (brand) { case SPWPN_SWORD_OF_CEREBOV: diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index c46fd7c87b..abb7f2f7fa 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -722,7 +722,7 @@ void formatted_message_history(const std::string &st_nocolor, if (wrap_col) { linebreak_string2(st, wrap_col); - } + } std::vector<formatted_string> fss; formatted_string::parse_string_to_multiple(st, fss); @@ -741,7 +741,7 @@ void formatted_message_history(const std::string &st_nocolor, more(); mpr_formatted_output(fs, colour); - + // message playback explicitly only handles colors for // the tutorial channel... guess we'll store bare strings // for the rest, then. diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 49f5b4f214..b67f7a584c 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -976,7 +976,7 @@ static const char* _list_allowed_keys(char yes1, char yes2, result += _list_alternative_yes(yes1, yes2, lowered); result += (lowered ? "/n/q" : "/N/Q"); result += "]"; - + return (result.c_str()); } |