X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Fgameconfig.hpp;h=3b7dd06da90a80d057b00de4b53107fcc36d1019;hb=73cb1e168850018eaa821a42b30bb221dc5186fe;hp=c26e5a5c6933a243df6f516952c2786ebf6813ae;hpb=4e70d578de5d05a2bbc945f1d3853db758161f8f;p=supertux.git

diff --git a/src/supertux/gameconfig.hpp b/src/supertux/gameconfig.hpp
index c26e5a5c6..3b7dd06da 100644
--- a/src/supertux/gameconfig.hpp
+++ b/src/supertux/gameconfig.hpp
@@ -17,8 +17,10 @@
 #ifndef HEADER_SUPERTUX_SUPERTUX_GAMECONFIG_HPP
 #define HEADER_SUPERTUX_SUPERTUX_GAMECONFIG_HPP
 
-#include "video/video_system.hpp"
+#include "control/joystick_config.hpp"
+#include "control/keyboard_config.hpp"
 #include "math/size.hpp"
+#include "video/video_system.hpp"
 
 class Config
 {
@@ -31,10 +33,10 @@ public:
 
   int profile;
 
-  // the width/height to be used to display the game in fullscreen
+  /** the width/height to be used to display the game in fullscreen */
   Size fullscreen_size;
 
-  // refresh rate for use in fullscreen, 0 for auto
+  /** refresh rate for use in fullscreen, 0 for auto */
   int fullscreen_refresh_rate;
 
   /** the width/height of the window managers window */
@@ -53,7 +55,8 @@ public:
   bool music_enabled;
   bool console_enabled;
 
-  int random_seed;            // initial random seed.  0 ==> set from time()
+  /** initial random seed.  0 ==> set from time() */
+  int random_seed;
 
   /** this variable is set if supertux should start in a specific level */
   std::string start_level;
@@ -61,7 +64,22 @@ public:
   std::string start_demo;
   std::string record_demo;
 
-  std::string locale; /**< force SuperTux language to this locale, e.g. "de". A file "data/locale/xx.po" must exist for this to work. An empty string means autodetect. */
+  /** force SuperTux language to this locale, e.g. "de". A file
+      "data/locale/xx.po" must exist for this to work. An empty string
+      means autodetect. */
+  std::string locale;
+
+  KeyboardConfig keyboard_config;
+  JoystickConfig joystick_config;
+
+  struct Addon
+  {
+    std::string id;
+    bool enabled;
+  };
+  std::vector<Addon> addons;
+
+  bool developer_mode;
 };
 
 #endif