projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Comment out resizable flag because it blue-screens on Windows
[supertux.git]
/
src
/
control
/
joystickkeyboardcontroller.hpp
diff --git
a/src/control/joystickkeyboardcontroller.hpp
b/src/control/joystickkeyboardcontroller.hpp
index
7df1865
..
f989ea6
100644
(file)
--- a/
src/control/joystickkeyboardcontroller.hpp
+++ b/
src/control/joystickkeyboardcontroller.hpp
@@
-21,11
+21,17
@@
#define __JOYSTICKKEYBOARDCONTROLLER_H__
#include "controller.hpp"
#define __JOYSTICKKEYBOARDCONTROLLER_H__
#include "controller.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
+
+namespace lisp {
+class Writer;
+class Lisp;
+}
+
#include <SDL.h>
#include <SDL.h>
+
#include <string>
#include <map>
#include <string>
#include <map>
+#include <vector>
class Menu;
class Menu;
@@
-45,6
+51,7
@@
public:
Menu* get_key_options_menu();
Menu* get_joystick_options_menu();
Menu* get_key_options_menu();
Menu* get_joystick_options_menu();
+ void updateAvailableJoysticks();
private:
void process_key_event(const SDL_Event& event);
private:
void process_key_event(const SDL_Event& event);
@@
-81,9
+88,12
@@
private:
int max_joyaxis;
int max_joyhats;
int max_joyaxis;
int max_joyhats;
-
+
Uint8 hat_state;
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);
SDLKey reversemap_key(Control c);
int reversemap_joybutton(Control c);
int reversemap_joyaxis(Control c);
@@
-96,6
+106,8
@@
private:
void bind_joyhat(int dir, Control c);
void bind_key(SDLKey key, Control c);
void bind_joyhat(int dir, Control c);
void bind_key(SDLKey key, Control c);
+ void set_joy_controls(Control id, bool value);
+
int wait_for_key;
int wait_for_joystick;
int wait_for_key;
int wait_for_joystick;