From 3c2b112c9d9921554e909cd063ba5050ad98665e Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Tue, 5 Aug 2014 02:40:15 +0200 Subject: [PATCH] Minor cleanup --- src/control/joystickkeyboardcontroller.cpp | 1 - src/control/joystickkeyboardcontroller.hpp | 5 +---- src/supertux/main.cpp | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/control/joystickkeyboardcontroller.cpp b/src/control/joystickkeyboardcontroller.cpp index 0e176e295..85c6b8ee3 100644 --- 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 // add by giby JoystickKeyboardController::JoystickKeyboardController() : controller(), diff --git a/src/control/joystickkeyboardcontroller.hpp b/src/control/joystickkeyboardcontroller.hpp index 705b7bc79..661ca7fb3 100644 --- a/src/control/joystickkeyboardcontroller.hpp +++ b/src/control/joystickkeyboardcontroller.hpp @@ -20,7 +20,6 @@ #include "control/controller.hpp" #include -#include // add by giby #include #include #include @@ -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 5dc4c88d1..ca02a0fd2 100644 --- 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); -- 2.11.0