Jeck - Language is now a per-profile option settable in the options menu. Also, game no longer crashes when no language files are present.

projects/mtg/include/GameOptions.h

@@ -23,7 +23,6 @@ public:
   enum {
     //Global settings
     ACTIVE_PROFILE,
-    LANG,
     DIFFICULTY_MODE_UNLOCKED,
     MOMIR_MODE_UNLOCKED,
     EVILTWIN_MODE_UNLOCKED,
@@ -31,6 +30,7 @@ public:
     LAST_GLOBAL = RANDOMDECK_MODE_UNLOCKED,
     //Values /must/ match ordering in optionNames, or everything loads wrong.
     //Profile settings    
+    LANG,
     ACTIVE_THEME,
     ACTIVE_MODE,
     MUSICVOLUME,

projects/mtg/include/GameStateMenu.h

@@ -43,7 +43,7 @@ class GameStateMenu: public GameState, public JGuiListener
   void setLang(int id);
   string getLang(string s);
   void loadLangMenu();
-
+  bool langChoices;
  public:
   GameStateMenu(GameApp* parent);
   virtual ~GameStateMenu();

projects/mtg/include/OptionItem.h

@@ -408,11 +408,28 @@ class OptionSelect:public OptionItem{
    size_t prior_value;
 };
 
+class OptionLanguage: public OptionSelect{
+ public:
+  OptionLanguage(string _displayValue);
+  
+  virtual void addSelection(string s) {addSelection(s,s);};
+  virtual void addSelection(string s,string show);
+  virtual void initSelections();
+  virtual void confirmChange(bool confirmed);
+  virtual void Reload();
+  virtual bool Visible();
+  virtual bool Selectable();
+  virtual void setData();
+protected:
+  vector<string> actual_data;
+};
+
+
 class OptionDirectory:public OptionSelect{
  public:
   virtual void Reload();
   OptionDirectory(string _root, int _id, string _displayValue);
-private:
+ protected:
   string root;
 };