Small improvement to PhysfsSubsystem debug output

[supertux.git] / src / supertux / gameconfig.hpp

diff --git a/src/supertux/gameconfig.hpp b/src/supertux/gameconfig.hpp
index ee032d4..a160e2e 100644 (file)
--- 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,12 @@ 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;
+
+  std::vector<std::string> disabled_addon_filenames;
 };
 
 #endif