X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Fgameconfig.hpp;h=3b7dd06da90a80d057b00de4b53107fcc36d1019;hb=84c71f11f1e47729777d6ad783f4d30b5894d7bc;hp=ee032d45a82b0cf8c4ef3e21d3476869cbf7305e;hpb=1ca7a41254b95a52083b63496b8a18048ee55253;p=supertux.git

diff --git a/src/supertux/gameconfig.hpp b/src/supertux/gameconfig.hpp
index ee032d45a..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
 {
@@ -65,7 +67,19 @@ public:
   /** 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; 
+  std::string locale;
+
+  KeyboardConfig keyboard_config;
+  JoystickConfig joystick_config;
+
+  struct Addon
+  {
+    std::string id;
+    bool enabled;
+  };
+  std::vector<Addon> addons;
+
+  bool developer_mode;
 };
 
 #endif