diff options
author | Adam Borowski <kilobyte@angband.pl> | 2013-08-24 23:09:04 +0200 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2013-08-24 23:09:04 +0200 |
commit | 9603c99af4c1a03c19d9ea5c11644a2720f6bc13 (patch) | |
tree | 4ae9431c64ef651282e74877ad5a8da5f9cd594b /crawl-ref/source/arena.cc | |
parent | f9e8197bc4ac3803e1bf0f803ae42eefbf4353a1 (diff) | |
download | crawl-ref-9603c99af4c1a03c19d9ea5c11644a2720f6bc13.tar.gz crawl-ref-9603c99af4c1a03c19d9ea5c11644a2720f6bc13.zip |
Cancel an american speling.
Looks like, unlike "target[t]ing" where a single t is used by many brits and
even some aussies, "cancel[l]ing" has double l even for a good deal of
americans.
Diffstat (limited to 'crawl-ref/source/arena.cc')
-rw-r--r-- | crawl-ref/source/arena.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index 2abe953dae..39ef845bbf 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -87,7 +87,7 @@ namespace arena static int total_trials = 0; - static bool contest_canceled = false; + static bool contest_cancelled = false; static bool is_respawning = false; @@ -690,7 +690,7 @@ namespace arena { if (key_is_escape(ch) || toalower(ch) == 'q') { - contest_canceled = true; + contest_cancelled = true; mpr("Canceled contest at user request"); return; } @@ -801,7 +801,7 @@ namespace arena const int ch = getchm(); handle_keypress(ch); ASSERT(crawl_state.game_is_arena() && !crawl_state.arena_suspended); - if (contest_canceled) + if (contest_cancelled) return; } @@ -910,7 +910,7 @@ namespace arena // Clear some things that shouldn't persist across restart_after_game. // parse_monster_spec and setup_fight will clear the rest. total_trials = trials_done = team_a_wins = ties = 0; - contest_canceled = false; + contest_cancelled = false; is_respawning = false; uniques_list.clear(); memset(banned_glyphs, 0, sizeof(banned_glyphs)); @@ -1008,7 +1008,7 @@ namespace arena if (trials_done < total_trials) delay(Options.arena_delay * 5); } - while (!contest_canceled && trials_done < total_trials); + while (!contest_cancelled && trials_done < total_trials); if (total_trials > 0) { |