summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/state.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-04-01 01:00:14 +0200
committerAdam Borowski <kilobyte@angband.pl>2011-04-01 01:00:14 +0200
commit452ff385766f7f82e4ff92f319dd3a284795fd2e (patch)
tree35f3bfd02c4d16d05cda2126aaf82dd945690686 /crawl-ref/source/state.cc
parent778a975c1cf474d6c585d2177956daff30cffc24 (diff)
parent5485922b1f7b6c4e369d0b885ccfbff0e6e0d850 (diff)
downloadcrawl-ref-452ff385766f7f82e4ff92f319dd3a284795fd2e.tar.gz
crawl-ref-452ff385766f7f82e4ff92f319dd3a284795fd2e.zip
Merge branch 'unicode'.
There are some issues left, like incorrect wrapping in some cases, but we can fix them later.
Diffstat (limited to 'crawl-ref/source/state.cc')
-rw-r--r--crawl-ref/source/state.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc
index 4e6089e222..87208b097f 100644
--- a/crawl-ref/source/state.cc
+++ b/crawl-ref/source/state.cc
@@ -31,8 +31,7 @@ game_state::game_state()
map_stat_gen(false), type(GAME_TYPE_NORMAL),
last_type(GAME_TYPE_UNSPECIFIED), arena_suspended(false),
dump_maps(false), test(false), script(false), build_db(false),
- tests_selected(), unicode_ok(false), show_more_prompt(true),
- glyph2strfn(NULL), multibyte_strlen(NULL),
+ tests_selected(), show_more_prompt(true),
terminal_resize_handler(NULL), terminal_resize_check(NULL),
doing_prev_cmd_again(false), prev_cmd(CMD_NO_CMD),
repeat_cmd(CMD_NO_CMD),cmd_repeat_started_unsafe(false),
@@ -461,8 +460,8 @@ void game_state::dump()
"updating_scores: %d:\n",
io_inited, need_save, saving_game, updating_scores);
fprintf(stderr, "seen_hups: %d, map_stat_gen: %d, type: %d, "
- "arena_suspended: %d, unicode_ok: %d\n",
- seen_hups, map_stat_gen, type, arena_suspended, unicode_ok);
+ "arena_suspended: %d\n",
+ seen_hups, map_stat_gen, type, arena_suspended);
if (last_winch)
fprintf(stderr, "Last resize was %ld seconds ago.\n",
(long int)(time(0) - last_winch));