rnd-19981020-2

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 84b651c9895e014d1900bbbecfb9be46a0197fe5..9e0ec6793b001410a511504cf552070f5484595a 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -1381,11 +1381,8 @@ boolean Request(char *text, unsigned int req_state)
 
   button_status = MB_RELEASED;
 
-  while(result<0)
+  while(result < 0)
   {
-    DoAnimation();
-    Delay(10);
-
     if (XPending(display))
     {
       XEvent event;
@@ -1494,6 +1491,11 @@ boolean Request(char *text, unsigned int req_state)
       else if (joy & JOY_BUTTON_2)
        result = 0;
     }
+
+    DoAnimation();
+
+    /* don't eat all CPU time */
+    Delay(10);
   }
 
   if (game_status != MAINMENU)
@@ -1676,6 +1678,9 @@ unsigned int MoveDoor(unsigned int door_state)
     }
   }
 
+  if (setup.quick_doors)
+    StopSound(SND_OEFFNEN);
+
   if (door_state & DOOR_ACTION_1)
     door1 = door_state & DOOR_ACTION_1;
   if (door_state & DOOR_ACTION_2)