Minor cleanup

diff --git a/src/control/joystickkeyboardcontroller.cpp b/src/control/joystickkeyboardcontroller.cpp
index 0e176e2..85c6b8e 100644 (file)
--- a/src/control/joystickkeyboardcontroller.cpp
+++ b/src/control/joystickkeyboardcontroller.cpp
@@ -28,7 +28,6 @@
 #include "supertux/menu/keyboard_menu.hpp"
 #include "util/gettext.hpp"
 #include "util/writer.hpp"
-//#include <SDL_keycode.h> // add by giby
 
 JoystickKeyboardController::JoystickKeyboardController() :
   controller(),

diff --git a/src/control/joystickkeyboardcontroller.hpp b/src/control/joystickkeyboardcontroller.hpp
index 705b7bc..661ca7f 100644 (file)
--- a/src/control/joystickkeyboardcontroller.hpp
+++ b/src/control/joystickkeyboardcontroller.hpp
@@ -20,7 +20,6 @@
 #include "control/controller.hpp"
 
 #include <SDL.h>
-#include <SDL_keycode.h> // add by giby
 #include <map>
 #include <string>
 #include <vector>
@@ -33,9 +32,7 @@ class KeyboardMenu;
 class JoystickMenu;
 class Controller;
 
-    //SDL_JoystickID myID = SDL_JoystickInstanceID(myOpenedStick);
-
-class JoystickKeyboardController // http://wiki.libsdl.org/moin.fcg/SDL_Joystick for info 
+class JoystickKeyboardController
 {
 private:
   friend class KeyboardMenu;

diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 5dc4c88..ca02a0f 100644 (file)
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -399,10 +399,6 @@ Main::init_sdl()
   // just to be sure
   atexit(SDL_Quit);
 
- // SDL_EnableUNICODE(1); //old code, mofif by giby 
- //   SDL_JoystickID myID = SDL_JoystickInstanceID(myOpenedStick);
-  
-
   // wait 100ms and clear SDL event queue because sometimes we have random
   // joystick events in the queue on startup...
   SDL_Delay(100);