From: Holger Schemel Date: Sun, 16 Feb 2025 14:24:53 +0000 (+0100) Subject: fixed not setting BD multiple lives if first level has level story X-Git-Tag: 4.4.0.4~1 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=94328133797a2a5d53c2ca1359caa6ad971cf621;p=rocksndiamonds.git fixed not setting BD multiple lives if first level has level story --- diff --git a/src/game.c b/src/game.c index 722b5921..a3156a1e 100644 --- a/src/game.c +++ b/src/game.c @@ -4046,6 +4046,8 @@ void InitGame(void) boolean restarting = (game_status == GAME_MODE_PLAYING); boolean restarting_same_level = (restarting && level_nr == last_level_nr); boolean level_story = (game_status == GAME_MODE_STORY); + boolean level_story_after_main = (level_story && game_status_last_screen == GAME_MODE_MAIN); + boolean starting_from_main = (game_status == GAME_MODE_MAIN || level_story_after_main); boolean last_game_engine_type_was_bd = (last_game_engine_type == GAME_ENGINE_TYPE_BD); boolean emulate_bd = TRUE; // unless non-BOULDERDASH elements found boolean emulate_sp = TRUE; // unless non-SUPAPLEX elements found @@ -4086,7 +4088,7 @@ void InitGame(void) if (level.bd_intermission) game_bd.global_lives--; } - else if (restarting_same_level || game_status == GAME_MODE_MAIN) + else if (restarting_same_level || starting_from_main) { // newly started BD game with multiple lives (or restarted BD game, but no remaining lives), // so set initial number of lives and reset global score