summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/state.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2010-10-15 02:17:01 +0200
committerAdam Borowski <kilobyte@angband.pl>2010-10-15 02:17:01 +0200
commitf7717330f1e10f18464a68edc1b595dd6a6b9527 (patch)
treedaff37556fe8b661c5d268b1429f73ae6669153d /crawl-ref/source/state.cc
parente7572d74b30900124d9a896843f42b1c957d20c2 (diff)
parent448542e984ad690be6be5869e0f47072981ed2ce (diff)
downloadcrawl-ref-f7717330f1e10f18464a68edc1b595dd6a6b9527.tar.gz
crawl-ref-f7717330f1e10f18464a68edc1b595dd6a6b9527.zip
Merge branch 'master' into unicode
Diffstat (limited to 'crawl-ref/source/state.cc')
-rw-r--r--crawl-ref/source/state.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc
index 2a5c391d71..fd96846346 100644
--- a/crawl-ref/source/state.cc
+++ b/crawl-ref/source/state.cc
@@ -169,8 +169,8 @@ void game_state::zero_turns_taken()
cancel_cmd_repeat();
}
-bool interrupt_cmd_repeat( activity_interrupt_type ai,
- const activity_interrupt_data &at )
+bool interrupt_cmd_repeat(activity_interrupt_type ai,
+ const activity_interrupt_data &at)
{
if (crawl_state.cmd_repeat_start)
return (false);
@@ -220,7 +220,7 @@ bool interrupt_cmd_repeat( activity_interrupt_type ai,
if (Hints.hints_left)
hints_monster_seen(*mon);
#else
- formatted_string fs( channel_to_colour(MSGCH_WARN) );
+ formatted_string fs(channel_to_colour(MSGCH_WARN));
fs.cprintf("%s (", mon->name(DESC_PLAIN, true).c_str());
monster_info mi(mon);
fs.add_glyph(get_mons_glyph(mi));