rnd-19981005-1

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index d0684ed3d220061fbcb3076b55b6ddd1c97054b2..71d03604c22eb6081e1632232d3ffb852a5c9e41 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -20,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;
 
@@ -244,7 +245,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)
@@ -701,6 +702,8 @@ void HandleNoXEvent()
     return;
   }
 
+  HandleNetworking();
+
   switch(game_status)
   {
     case MAINMENU:
@@ -785,7 +788,12 @@ void HandleJoystick()
       if (tape.pausing || AllPlayersGone)
        joy = 0;
 
-      HandleGameActions(joy);
+      /*
+      if (!network_player_action_stored)
+       SendToServer_MovePlayer(joy, 0);
+      */
+
+      HandleGameActions((byte)joy);
       break;
 
     default: