Separate KeyboardConfig out into a separate class that can be stored in the global...

[supertux.git] / src / control / input_manager.cpp

diff --git a/src/control/input_manager.cpp b/src/control/input_manager.cpp
index a4cad70..6c7b12c 100644 (file)
--- a/src/control/input_manager.cpp
+++ b/src/control/input_manager.cpp
@@ -29,10 +29,10 @@
 #include "util/log.hpp"
 #include "util/writer.hpp"
 
-InputManager::InputManager() :
+InputManager::InputManager(KeyboardConfig& keyboard_config) :
   controller(new Controller),
   m_use_game_controller(true),
-  keyboard_manager(new KeyboardManager(this)),
+  keyboard_manager(new KeyboardManager(this, keyboard_config)),
   joystick_manager(new JoystickManager(this)),
   game_controller_manager(new GameControllerManager(this))
 {
@@ -57,6 +57,7 @@ InputManager::use_game_controller(bool v)
 void
 InputManager::read(const Reader& lisp)
 {
+#ifdef GRUMBEL
   const lisp::Lisp* keymap_lisp = lisp.get_lisp("keymap");
   if (keymap_lisp)
   {
@@ -68,11 +69,13 @@ InputManager::read(const Reader& lisp)
   {
     joystick_manager->read(joystick_lisp);
   }
+#endif
 }
 
 void
 InputManager::write(Writer& writer)
 {
+#ifdef GRUMBEL
   writer.start_list("keymap");
   keyboard_manager->write(writer);
   writer.end_list("keymap");
@@ -80,6 +83,7 @@ InputManager::write(Writer& writer)
   writer.start_list("joystick");
   joystick_manager->write(writer);
   writer.end_list("joystick");
+#endif
 }
 
 void