X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=088650b17f2242a38244c4ccd944c74ebd6f46d3;hb=e7f36cd97c8580345714b4a22d6b4ad291e50ed6;hp=48638bdeea8cd7f31bc409e9df7f81f7a91f3626;hpb=7b31a77eec53ed2b96d5924a743b0706c9e4b11c;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 48638bde..088650b1 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  events.c                                                *
 ***********************************************************/
@@ -21,12 +20,13 @@
 #include "misc.h"
 #include "tape.h"
 #include "joystick.h"
+#include "network.h"
 
 void EventLoop(void)
 {
   while(1)
   {
-    if (XPending(display))	/* got an event */
+    if (XPending(display))	/* got event from X server */
     {
       XEvent event;
 
@@ -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;
@@ -245,7 +263,7 @@ void HandleClientMessageEvent(XClientMessageEvent *event)
 {
   if ((event->window == window) &&
       (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
-    CloseAll();
+    game_status = EXITGAME;
 }
 
 void HandleButton(int mx, int my, int button)
@@ -273,7 +291,7 @@ void HandleButton(int mx, int my, int button)
     int sx = (mx - SX) / TILEX;
     int sy = (my - SY) / TILEY;
 
-    if (IN_SCR_FIELD(sx,sy))
+    if (IN_VIS_FIELD(sx,sy))
     {
       int x = LEVELX(sx);
       int y = LEVELY(sy);
@@ -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;
@@ -673,7 +697,9 @@ void HandleKey(KeySym key, int key_status)
 	  {
 	    char *color[] = { "yellow", "red", "green", "blue" };
 
-	    TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
+	    do
+	      TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
+	    while(!stored_player[TestPlayer].active);
 
 	    printf("TestPlayer = %d (%s player)\n",
 		   TestPlayer, color[TestPlayer]);
@@ -700,6 +726,9 @@ void HandleNoXEvent()
     return;
   }
 
+  if (network)
+    HandleNetworking();
+
   switch(game_status)
   {
     case MAINMENU:
@@ -726,7 +755,7 @@ 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;
   int up	= joy & JOY_UP;
@@ -779,7 +808,7 @@ void HandleJoystick()
       if (tape.pausing || AllPlayersGone)
 	joy = 0;
 
-      HandleGameActions(joy);
+      HandleGameActions((byte)joy);
       break;
 
     default: