rnd-20060828-1-src

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 9dff9b9e5be507853d074183a73861020e634c71..23a255108812d00a7028e4d171f69cc6f408bdd7 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -424,24 +424,24 @@ void FadeExt(int fade_mask, int fade_mode)
   int post_delay = (fade_mode == FADE_MODE_FADE_OUT ? menu.post_delay : 0);
   int x, y, width, height;
 
-  if (fade_mask & REDRAW_ALL)
-  {
-    x = 0;
-    y = 0;
-    width  = WIN_XSIZE;
-    height = WIN_YSIZE;
-  }
-  else if (fade_mask & REDRAW_FIELD)
+  if (fade_mask & REDRAW_FIELD)
   {
     x = REAL_SX;
     y = REAL_SY;
     width  = FULL_SXSIZE;
     height = FULL_SYSIZE;
   }
+  else         /* REDRAW_ALL */
+  {
+    x = 0;
+    y = 0;
+    width  = WIN_XSIZE;
+    height = WIN_YSIZE;
+  }
 
   redraw_mask |= fade_mask;
 
-  if (!setup.fading || fade_delay == 0)
+  if (!setup.fade_screens || fade_delay == 0)
   {
     if (fade_mode == FADE_MODE_FADE_OUT)
       ClearRectangle(backbuffer, x, y, width, height);
@@ -2226,6 +2226,10 @@ void WaitForEventToContinue()
 
   button_status = MB_RELEASED;
 
+#if 1
+  ClearEventQueue();
+#endif
+
   while (still_wait)
   {
     if (PendingEvent())
@@ -5306,9 +5310,9 @@ int getGameFrameDelay_EM(int native_em_game_frame_delay)
 unsigned int InitRND(long seed)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-    return InitEngineRND_EM(seed);
+    return InitEngineRandom_EM(seed);
   else
-    return InitEngineRND(seed);
+    return InitEngineRandom_RND(seed);
 }
 
 void InitGraphicInfo_EM(void)