rnd-20070403-3-src

* fixed bug when fading out to game screen with border mask defined

diff --git a/ChangeLog b/ChangeLog
index 52c3f76c5d2d9dfd86b5d5623ec5b594765b324b..9e06c9d2a96647200841f4373e02ae8ed766c948 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
          - panel fonts now use ".PANEL" suffix instead of ".PLAYING" suffix
          - panel graphics now use ".PANEL" suffix instead of ".DOOR" suffix
          (else graphics would have to use ".PLAYING", which would be confusing)
+       * fixed bug when fading out to game screen with border mask defined
 
 2007-04-02
        * added attribute ".tile_size" for element style game panel controls

diff --git a/src/conftime.h b/src/conftime.h
index 1489e6f9eeadbeda313ce98c173ffd4b0c0dd8e8..e4a03f30e5142d5b18be87060e87af36b1cf4ed1 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-04-03 19:40"
+#define COMPILE_DATE_STRING "2007-04-03 20:17"

diff --git a/src/game.c b/src/game.c
index d2787a10f8da741baf8f8e6d5433f5a5a789083f..33386d84ad1c9543b85798f4970e4473005db006 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -3594,6 +3594,9 @@ void InitGame()
                local_player->jy - MIDPOSY);
   }
 
+  /* do not use PLAYING mask for fading out from main screen */
+  game_status = GAME_MODE_MAIN;
+
   StopAnimation();
 
   if (!game.restart_level)
@@ -3618,6 +3621,8 @@ void InitGame()
     FadeOut(REDRAW_FIELD);
 #endif
 
+  game_status = GAME_MODE_PLAYING;
+
   /* !!! FIX THIS (START) !!! */
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
   {

diff --git a/src/tools.c b/src/tools.c
index be4218ccd34e21522f1956c4e02a0013518496c3..8b348d0b4e335d484b24296cce775b24bd26bbe0 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -559,12 +559,20 @@ void FadeExt(int fade_mask, int fade_mode)
 
 #if 1
   if (global.autoplay_leveldir)
-    fading.fade_mode = FADE_MODE_NONE;
+  {
+    // fading.fade_mode = FADE_MODE_NONE;
+
+    return;
+  }
 #endif
 
 #if 1
   if (fading.fade_mode == FADE_MODE_NONE)
+  {
+    BackToFront();
+
     return;
+  }
 #endif
 
   if (fade_mask & REDRAW_FIELD)