fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/control/joystickkeyboardcontroller.hpp b/src/control/joystickkeyboardcontroller.hpp
index a39f68b..7d88932 100644 (file)
--- a/src/control/joystickkeyboardcontroller.hpp
+++ b/src/control/joystickkeyboardcontroller.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,11 +12,10 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __JOYSTICKKEYBOARDCONTROLLER_H__
 #define __JOYSTICKKEYBOARDCONTROLLER_H__
@@ -42,20 +41,21 @@ public:
 
   void write(lisp::Writer& writer);
   void read(const lisp::Lisp& lisp);
-       bool check_cheatcode(const std::string& cheatcode);
   void reset();
 
   Menu* get_key_options_menu();
   Menu* get_joystick_options_menu();
 
 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<SDLKey, Control> KeyMap;
   KeyMap keymap;
 
   std::vector<SDL_Joystick*> joysticks;
-    
+
   typedef std::map<int, Control> ButtonMap;
   ButtonMap joy_button_map;
   std::string name;
@@ -68,14 +68,15 @@ private:
   int min_joybuttons;
   /// the max number of buttons a joystick has
   int max_joybuttons;
-
+/*
   enum {
     MNID_KEY_UP,
     MNID_KEY_DOWN,
     MNID_KEY_LEFT,
     MNID_KEY_RIGHT,
     MNID_KEY_JUMP,
-    MNID_KEY_ACTION
+    MNID_KEY_ACTION,
+    MNID_KEY_CONSOLE
   };
   enum {
     MNID_JS_JUMP,
@@ -83,6 +84,7 @@ private:
     MNID_JS_MENU,
     MNID_JS_PAUSE
   };
+  */
   SDLKey reversemap_key(Control c);
   int reversemap_joybutton(Control c);
   void reset_joybutton(int button, Control c);
@@ -93,14 +95,11 @@ private:
 
   class KeyboardMenu;
   class JoystickMenu;
-  
+
   KeyboardMenu* key_options_menu;
   JoystickMenu* joystick_options_menu;
   friend class KeyboardMenu;
   friend class JoystickMenu;
-
-  char last_keys[20];
 };
 
 #endif
-