[Pingus-CVS] r3063 - in trunk/pingus/src: . gui

[grumbel at BerliOS]

Author: grumbel
Date: 2007-09-02 06:38:25 +0200 (Sun, 02 Sep 2007)
New Revision: 3063

Modified:
   trunk/pingus/src/client.cpp
   trunk/pingus/src/gui/gui_screen.cpp
   trunk/pingus/src/pingus_main.cpp
Log:
- init joystick subsystem on startup
- removed debug std::cout

Modified: trunk/pingus/src/client.cpp
===================================================================
--- trunk/pingus/src/client.cpp 2007-09-02 04:29:05 UTC (rev 3062)
+++ trunk/pingus/src/client.cpp 2007-09-02 04:38:25 UTC (rev 3063)
@@ -183,7 +183,7 @@
 void
 Client::process_axis_event (const Input::AxisEvent& event)
 {
-  std::cout << "Client::process_axis_event ()" << std::endl;
+  // std::cout << "Client::process_axis_event ()" << std::endl;
   UNUSED_ARG(event);
 }
 

Modified: trunk/pingus/src/gui/gui_screen.cpp
===================================================================
--- trunk/pingus/src/gui/gui_screen.cpp 2007-09-02 04:29:05 UTC (rev 3062)
+++ trunk/pingus/src/gui/gui_screen.cpp 2007-09-02 04:38:25 UTC (rev 3063)
@@ -73,7 +73,7 @@
             {
               if (i->axis.name == Input::ACTION_AXIS)
                 {
-                  on_action_axis_move (i->axis.dir);
+                  on_action_axis_move(i->axis.dir);
                 }
             }
             break;

Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp    2007-09-02 04:29:05 UTC (rev 3062)
+++ trunk/pingus/src/pingus_main.cpp    2007-09-02 04:38:25 UTC (rev 3063)
@@ -873,7 +873,7 @@
 void
 PingusMain::init_sdl()
 {
-  if (SDL_Init(SDL_INIT_VIDEO) != 0) {
+  if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) != 0) {
     std::cout << "Unable to initialize SDL: " << SDL_GetError() << std::endl;
     exit(1);
   }