[Pingus-CVS] r3080 - in trunk/pingus/src: . input

[grumbel at BerliOS]

Author: grumbel
Date: 2007-09-05 03:40:24 +0200 (Wed, 05 Sep 2007)
New Revision: 3080

Modified:
   trunk/pingus/src/input/sdl_driver.cpp
   trunk/pingus/src/pingus_main.cpp
Log:
- fixed GlobalEvent

Modified: trunk/pingus/src/input/sdl_driver.cpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.cpp       2007-09-05 01:35:15 UTC (rev 
3079)
+++ trunk/pingus/src/input/sdl_driver.cpp       2007-09-05 01:40:24 UTC (rev 
3080)
@@ -19,6 +19,7 @@
 **  02111-1307, USA.
 */
 
+#include "global_event.hpp"
 #include "file_reader.hpp"
 #include "sdl_driver.hpp"
 
@@ -238,6 +239,11 @@
 
           case SDL_KEYDOWN:
           case SDL_KEYUP:
+            if (event.key.state == SDL_PRESSED)
+              global_event.on_button_press(event.key);
+            else
+              global_event.on_button_release(event.key);            
+
             for(std::vector<KeyboardButtonBinding>::iterator i = 
keyboard_button_bindings.begin();
                 i != keyboard_button_bindings.end(); ++i)
               {

Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp    2007-09-05 01:35:15 UTC (rev 3079)
+++ trunk/pingus/src/pingus_main.cpp    2007-09-05 01:40:24 UTC (rev 3080)
@@ -53,7 +53,6 @@
 #include "globals.hpp"
 #include "system.hpp"
 #include "pingus_error.hpp"
-// #include "global_event.hpp"
 #include "config.hpp"
 #include "console.hpp"
 #include "fps_counter.hpp"
@@ -686,13 +685,6 @@
   if (print_fps)
     Display::add_flip_screen_hook(&fps_counter);
 
-  if (!render_preview)
-    {
-      // Register the global event catcher
-      //on_button_press_slot   = 
window->get_ic()->get_keyboard().sig_key_down().connect (&global_event, 
&GlobalEvent::on_button_press);
-      //on_button_release_slot = 
window->get_ic()->get_keyboard().sig_key_up().connect (&global_event, 
&GlobalEvent::on_button_release);
-    }
-
   // Set the root screen
   if (show_input_debug_screen) // show a debug screen
     {