-Use "jump-with-up" in config for all controlers. No need

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

diff --git a/src/control/joystickkeyboardcontroller.hpp b/src/control/joystickkeyboardcontroller.hpp
index 40f1afa..9b6a39f 100644 (file)
--- a/src/control/joystickkeyboardcontroller.hpp
+++ b/src/control/joystickkeyboardcontroller.hpp
@@ -50,9 +50,12 @@ private:
   void process_key_event(const SDL_Event& event);
   void process_hat_event(const SDL_JoyHatEvent& jhat);
   void process_axis_event(const SDL_JoyAxisEvent& jaxis);
+  void process_button_event(const SDL_JoyButtonEvent& jbutton);
   void process_console_key_event(const SDL_Event& event);
   void process_menu_key_event(const SDL_Event& event);
 
+  void print_joystick_mappings();
+
   typedef std::map<SDLKey, Control> KeyMap;
   KeyMap keymap;
 
@@ -78,20 +81,25 @@ private:
   int max_joyaxis;
 
   int max_joyhats;
-  
+
   Uint8 hat_state;
 
+  bool jump_with_up_joy; // Joystick up jumps
+  bool jump_with_up_kbd; // Keyboard up jumps
+
   SDLKey reversemap_key(Control c);
   int    reversemap_joybutton(Control c);
   int    reversemap_joyaxis(Control c);
   int    reversemap_joyhat(Control c);
 
-  void unbind_control(Control c);
+  void unbind_joystick_control(Control c);
+
+  void bind_joybutton(int button, Control c);
+  void bind_joyaxis(int axis, Control c);
+  void bind_joyhat(int dir, Control c);
+  void bind_key(SDLKey key, Control c);
 
-  void reset_joybutton(int button, Control c);
-  void reset_joyaxis(int axis, Control c);
-  void reset_joyhat(int dir, Control c);
-  void reset_key(SDLKey key, Control c);
+  void set_joy_controls(Control id, bool value);
 
   int wait_for_key;
   int wait_for_joystick;