X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=2d8eca3e861657b6442169036ac88d5395f08934;hp=2ef8fd6d4991a974defc5cc03b9bdb795b635a45;hb=50c422d96b6da2c0412b6bd3763e9d1a029a6014;hpb=4f767d54c7ac468e9a42e22caf716111be1ceba9

diff --git a/src/events.c b/src/events.c
index 2ef8fd6d..2d8eca3e 100644
--- a/src/events.c
+++ b/src/events.c
@@ -258,9 +258,11 @@ void HandleFocusEvent(XFocusChangeEvent *event)
 
 void HandleClientMessageEvent(XClientMessageEvent *event)
 {
+#ifndef MSDOS
   if ((event->window == window) &&
       (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
     CloseAllAndExit(0);
+#endif
 }
 
 void HandleButton(int mx, int my, int button)
@@ -600,8 +602,10 @@ void HandleNoXEvent()
     return;
   }
 
+#ifndef MSDOS
   if (options.network)
     HandleNetworking();
+#endif
 
   HandleJoystick();
 
@@ -618,12 +622,19 @@ static int HandleJoystickForAllPlayers()
   {
     byte joy_action = 0;
 
+    /*
     if (!setup.input[i].use_joystick)
       continue;
+      */
 
     joy_action = Joystick(i);
     result |= joy_action;
 
+
+    if (!setup.input[i].use_joystick)
+      continue;
+
+
     stored_player[i].action = joy_action;
   }
 
@@ -651,7 +662,7 @@ void HandleJoystick()
     case SETUP:
     case SETUPINPUT:
     {
-      static long joystickmove_delay = 0;
+      static unsigned long joystickmove_delay = 0;
 
       if (joystick && !button && !DelayReached(&joystickmove_delay, 150))
 	newbutton = dx = dy = 0;