X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=7da6e5536c058fb79e9598f4a8a95e10de3cee7c;hb=4c23826c2c9f8f6c7d1fec69769ba0d7254c9a7c;hp=a46f3548117071086e8be052b6024e40e7c0647b;hpb=bb2ddcf13df18d69e4472d4697da173981970e9d;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index a46f3548..7da6e553 100644
--- a/src/events.c
+++ b/src/events.c
@@ -79,13 +79,15 @@ void EventLoop(void)
   	}
       }
     }
-
-    HandleNoXEvent();
+    else
+      HandleNoEvent();
 
     /* don't use all CPU time when idle; the main loop while playing
        has its own synchronization and is CPU friendly, too */
 
-    if (game_status != PLAYING)
+    if (game_status == PLAYING)
+      HandleGameActions();
+    else
     {
       SyncDisplay();
       if (!PendingEvent())	/* delay only if no pending events */
@@ -121,7 +123,7 @@ void HandleOtherEvents(Event *event)
       HandleClientMessageEvent((ClientMessageEvent *) event);
       break;
 
-#ifdef USE_SDL_LIBRARY
+#ifdef USE_SDL_JOYSTICK
     case SDL_JOYAXISMOTION:
     case SDL_JOYBUTTONDOWN:
     case SDL_JOYBUTTONUP:
@@ -258,7 +260,7 @@ void HandleMotionEvent(MotionEvent *event)
   if (!PointerInWindow(window))
     return;	/* window and pointer are on different screens */
 
-#if 0
+#if 1
   if (button_status == MB_RELEASED && game_status != LEVELED)
     return;
 #endif
@@ -738,7 +740,7 @@ void HandleKey(Key key, int key_status)
   }
 }
 
-void HandleNoXEvent()
+void HandleNoEvent()
 {
   if (button_status && game_status != PLAYING)
   {
@@ -752,9 +754,6 @@ void HandleNoXEvent()
 #endif
 
   HandleJoystick();
-
-  if (game_status == PLAYING)
-    HandleGameActions();
 }
 
 static int HandleJoystickForAllPlayers()