rnd-19981021-1

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index 088650b17f2242a38244c4ccd944c74ebd6f46d3..976974ac58891e6b9c8db2bab1c9057e876dac75 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -136,7 +136,7 @@ void ClearEventQueue()
 
 void SleepWhileUnmapped()
 {
-  BOOL window_unmapped = TRUE;
+  boolean window_unmapped = TRUE;
 
   XAutoRepeatOn(display);
 
@@ -177,7 +177,7 @@ void HandleExposeEvent(XExposeEvent *event)
   int x = event->x, y = event->y;
   int width = event->width, height = event->height;
 
-  if (direct_draw_on && game_status==PLAYING)
+  if (setup.direct_draw_on && game_status==PLAYING)
   {
     int xx,yy;
     int x1 = (x-SX)/TILEX, y1 = (y-SY)/TILEY;
@@ -194,7 +194,7 @@ void HandleExposeEvent(XExposeEvent *event)
     SetDrawtoField(DRAW_DIRECT);
   }
 
-  if (soft_scrolling_on && game_status == PLAYING)
+  if (setup.soft_scrolling_on && game_status == PLAYING)
   {
     int fx = FX, fy = FY;
 
@@ -263,7 +263,7 @@ void HandleClientMessageEvent(XClientMessageEvent *event)
 {
   if ((event->window == window) &&
       (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
-    game_status = EXITGAME;
+    CloseAllAndExit(0);
 }
 
 void HandleButton(int mx, int my, int button)
@@ -672,7 +672,7 @@ void HandleKey(KeySym key, int key_status)
          }
          */
 
-         printf("direct_draw_on == %d\n", direct_draw_on);
+         printf("direct_draw_on == %d\n", setup.direct_draw_on);
 
          break;
 
@@ -726,7 +726,7 @@ void HandleNoXEvent()
     return;
   }
 
-  if (network)
+  if (options.network)
     HandleNetworking();
 
   switch(game_status)
@@ -773,7 +773,7 @@ void HandleJoystick()
     {
       static long joystickmove_delay = 0;
 
-      if (joystick && !button && !DelayReached(&joystickmove_delay,15))
+      if (joystick && !button && !DelayReached(&joystickmove_delay,150))
        newbutton = dx = dy = 0;
 
       if (game_status==MAINMENU)