Fall back to ASCII if Unicode locale is unavailable (Guus). Also queue up startup error messages and display them before the newgame screen instead of emitting them to stderr.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2882 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 0 deletions

diff --git a/crawl-ref/source/state.h b/crawl-ref/source/state.h
index 8347cd0470..cd572ed865 100644
--- a/crawl-ref/source/state.h
+++ b/crawl-ref/source/state.h
@@ -14,6 +14,7 @@
 #define STATE_H
 
 #include "enum.h"
+#include <vector>
 
 struct god_act_state
 {
@@ -65,6 +66,8 @@ struct game_state
     int             prev_repetition_turn;
     bool            cmd_repeat_started_unsafe;
 
+    std::vector<std::string> startup_errors;
+    
     std::vector<std::string> input_line_strs;
     unsigned int             input_line_curr;
 
@@ -80,6 +83,9 @@ protected:
 public:
     game_state();
 
+    void add_startup_error(const std::string &error);
+    void show_startup_errors();
+    
     bool is_replaying_keys() const;
 
     bool is_repeating_cmd() const;