X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcontrol%2Fjoystickkeyboardcontroller.hpp;h=7d88932fc4b32217c51a685212c811ab76a5d26a;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=e113d423503884c2e7c8f4b2e6c083be1b3fcc6c;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git diff --git a/src/control/joystickkeyboardcontroller.hpp b/src/control/joystickkeyboardcontroller.hpp index e113d4235..7d88932fc 100644 --- a/src/control/joystickkeyboardcontroller.hpp +++ b/src/control/joystickkeyboardcontroller.hpp @@ -50,12 +50,12 @@ private: void process_key_event(const SDL_Event& event); void process_console_key_event(const SDL_Event& event); void process_menu_key_event(const SDL_Event& event); - + typedef std::map KeyMap; KeyMap keymap; std::vector joysticks; - + typedef std::map ButtonMap; ButtonMap joy_button_map; std::string name; @@ -95,7 +95,7 @@ private: class KeyboardMenu; class JoystickMenu; - + KeyboardMenu* key_options_menu; JoystickMenu* joystick_options_menu; friend class KeyboardMenu; @@ -103,4 +103,3 @@ private: }; #endif -