make joystick_options_menu and key_options_menu part of joystickkeyboardcontroller...

[supertux.git] / src / control / joystickkeyboardcontroller.hpp

diff --git a/src/control/joystickkeyboardcontroller.hpp b/src/control/joystickkeyboardcontroller.hpp
index 33d6020..7ef6882 100644 (file)
--- a/src/control/joystickkeyboardcontroller.hpp
+++ b/src/control/joystickkeyboardcontroller.hpp
@@ -46,8 +46,8 @@ public:
   void read(const Reader& lisp);
   void reset();
 
-  Menu* get_key_options_menu();
-  Menu* get_joystick_options_menu();
+  KeyboardMenu* get_key_options_menu();
+  JoystickMenu* get_joystick_options_menu();
   void updateAvailableJoysticks();
 
 private:
@@ -114,6 +114,9 @@ private:
   int wait_for_key;
   int wait_for_joystick;
 
+  KeyboardMenu* key_options_menu;
+  JoystickMenu* joystick_options_menu;
+
 private:
   JoystickKeyboardController(const JoystickKeyboardController&);
   JoystickKeyboardController& operator=(const JoystickKeyboardController&);