rnd-19981006-1

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 71d03604c22eb6081e1632232d3ffb852a5c9e41..92bdeef6c4b2f5c04e576cc439a18e0f501d96f9 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -62,6 +62,21 @@ void EventLoop(void)
          break;
       }
     }
+
+    HandleNoXEvent();
+
+    /* 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)
+    {
+      XSync(display, FALSE);
+      Delay(10);
+    }
+
+
+
+#if 0
     else                       /* got no event, but don't be lazy... */
     {
       HandleNoXEvent();
@@ -75,6 +90,9 @@ void EventLoop(void)
        Delay(10);
       }
     }
+#endif
+
+
 
     if (game_status == EXITGAME)
       return;
@@ -314,7 +332,13 @@ void HandleButton(int mx, int my, int button)
       HandleSetupScreen(mx,my,0,0,button);
       break;
     case PLAYING:
+
+      /* --> NoXEvent() will follow */
+
+      /*
       HandleGameActions(0);
+      */
+
       break;
     default:
       break;
@@ -730,11 +754,6 @@ void HandleJoystick()
 {
   int joystick = Joystick();
   int keyboard = key_joystick_mapping;
-
-  /*
-  int joy      = (tape.playing ? TapePlayAction() : (joystick | keyboard));
-  */
-
   int joy      = (joystick | keyboard);
   int left     = joy & JOY_LEFT;
   int right    = joy & JOY_RIGHT;
@@ -788,11 +807,6 @@ void HandleJoystick()
       if (tape.pausing || AllPlayersGone)
        joy = 0;
 
-      /*
-      if (!network_player_action_stored)
-       SendToServer_MovePlayer(joy, 0);
-      */
-
       HandleGameActions((byte)joy);
       break;