From: Holger Schemel Date: Wed, 22 Mar 2017 19:04:19 +0000 (+0100) Subject: moved initial cycling of mirrors from 'after fading in' to 'after opening door' ... X-Git-Tag: 4.1.0.0~153 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=113a9a0fdeb78daec8c23413359763ef362a58d2;p=rocksndiamonds.git moved initial cycling of mirrors from 'after fading in' to 'after opening door' (MM engine) --- diff --git a/src/game.c b/src/game.c index b8383b11..14aac769 100644 --- a/src/game.c +++ b/src/game.c @@ -4120,9 +4120,6 @@ void InitGame() FadeIn(fade_mask); - if (level.game_engine_type == GAME_ENGINE_TYPE_MM) - InitGameEngine_MM_AfterFadingIn(); - #if 1 // full screen redraw is required at this point in the following cases: // - special editor door undrawn when game was started from level editor @@ -4211,6 +4208,9 @@ void InitGame() game.restart_level = FALSE; + if (level.game_engine_type == GAME_ENGINE_TYPE_MM) + InitGameActions_MM(); + SaveEngineSnapshotToListInitial(); } diff --git a/src/game_mm/export.h b/src/game_mm/export.h index 2c7ccea1..ba805a2a 100644 --- a/src/game_mm/export.h +++ b/src/game_mm/export.h @@ -199,7 +199,7 @@ void InitElementProperties_MM(); extern void InitGfxBuffers_MM(); extern void InitGameEngine_MM(); -extern void InitGameEngine_MM_AfterFadingIn(); +extern void InitGameActions_MM(); extern void GameActions_MM(byte *, boolean); extern void ClickElement(int, int, int); diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c index 0502660b..8729d165 100644 --- a/src/game_mm/mm_game.c +++ b/src/game_mm/mm_game.c @@ -350,7 +350,7 @@ void InitGameEngine_MM() DrawLevel_MM(); } -void InitGameEngine_MM_AfterFadingIn() +void InitGameActions_MM() { InitCycleElements(); InitLaser();