From 91a095e154530ce26758d84bbfbb11726d1bb26b Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Tue, 3 Apr 2007 21:16:10 +0200 Subject: [PATCH] rnd-20070403-3-src * fixed bug when fading out to game screen with border mask defined --- ChangeLog | 1 + src/conftime.h | 2 +- src/game.c | 5 +++++ src/tools.c | 10 +++++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52c3f76c..9e06c9d2 100644 --- 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 1489e6f9..e4a03f30 100644 --- 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 d2787a10..33386d84 100644 --- 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 be4218cc..8b348d0b 100644 --- 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) -- 2.34.1