Merge branch 'master' into unicode

1 files changed, 9 insertions, 0 deletions

diff --git a/crawl-ref/source/state.h b/crawl-ref/source/state.h
index e34da51254..3366ff40f7 100644
--- a/crawl-ref/source/state.h
+++ b/crawl-ref/source/state.h
@@ -42,6 +42,7 @@ struct game_state
     bool waiting_for_command; // True when the game is waiting for a command.
     bool terminal_resized;   // True if the term was resized and we need to
                              // take action to handle it.
+    time_t last_winch;       // Time of last resize, for crash dumps.
 
     bool io_inited;         // Is curses or the equivalent initialised?
     bool need_save;         // Set to true when game has started.
@@ -53,6 +54,8 @@ struct game_state
     bool map_stat_gen;      // Set if we're generating stats on maps.
 
     game_type type;
+    game_type last_type;
+    bool last_game_won;
     bool arena_suspended;   // Set if the arena has been temporarily
                             // suspended.
 
@@ -166,6 +169,7 @@ public:
     bool game_is_sprint() const;
     bool game_is_zotdef() const;
     bool game_is_hints() const;
+    bool game_is_hints_tutorial() const;
 
     // Save subdirectory used for games such as Sprint.
     std::string game_type_name() const;
@@ -174,6 +178,11 @@ public:
 
     static std::string game_type_name_for(game_type gt);
 
+    inline void mark_last_game_won()
+    {
+        last_game_won = true;
+    }
+
     friend class mon_acting;
 };