X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcontrol%2Finput_manager.hpp;h=d047e537b75a4195716ef36a1b36c54f4274aa04;hb=8f2d3b4b577297359c0cb57acb7e0782a3c35ea5;hp=1a0736c061a2ab98137d9793a705dbb45b2d7988;hpb=a8057c3d1726484928a3091fdd5c7a3d810f5f63;p=supertux.git diff --git a/src/control/input_manager.hpp b/src/control/input_manager.hpp index 1a0736c06..d047e537b 100644 --- a/src/control/input_manager.hpp +++ b/src/control/input_manager.hpp @@ -25,6 +25,7 @@ #include #include +#include "util/currenton.hpp" #include "util/reader_fwd.hpp" #include "util/writer_fwd.hpp" @@ -35,8 +36,10 @@ class JoystickMenu; class KeyboardManager; class KeyboardMenu; class Menu; +class KeyboardConfig; +class JoystickConfig; -class InputManager final +class InputManager final : public Currenton { private: friend class KeyboardMenu; @@ -45,13 +48,12 @@ private: typedef Controller::Control Control; public: - InputManager(); + InputManager(KeyboardConfig& keyboard_config, + JoystickConfig& joystick_config); virtual ~InputManager(); void process_event(const SDL_Event& event); - void write(Writer& writer); - void read(const Reader& lisp); void update(); void reset();