Merge branch 'master' into unicode

Conflicts galore...

1 files changed, 6 insertions, 4 deletions

diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc
index 79b5fff3c1..f30a1f72eb 100644
--- a/crawl-ref/source/state.cc
+++ b/crawl-ref/source/state.cc
@@ -29,14 +29,16 @@ game_state::game_state()
       terminal_resized(false), io_inited(false), need_save(false),
       saving_game(false), updating_scores(false), seen_hups(0),
       map_stat_gen(false), type(GAME_TYPE_NORMAL), arena_suspended(false),
-      test(false), script(false), build_db(false), tests_selected(),
-      show_more_prompt(true),
+      dump_maps(false), test(false), script(false), build_db(false),
+      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),
       level_annotation_shown(false),
 #ifndef USE_TILE
       mlist_targeting(false),
+#else
+      title_screen(true),
 #endif
       darken_range(-1), unsaved_macros(false), mon_act(NULL)
 {
@@ -590,9 +592,9 @@ std::string game_state::game_type_name_for(game_type _type)
     case GAME_TYPE_ARENA:
         return "Arena";
     case GAME_TYPE_SPRINT:
-        return "Sprint";
+        return "Dungeon Sprint";
     case GAME_TYPE_ZOTDEF:
-        return "Zot Defense";
+        return "Zot Defence";
     }
 }