From: Holger Schemel Date: Wed, 11 May 2022 11:41:50 +0000 (+0200) Subject: changed setting flag to continue playing next level from hall of fame X-Git-Tag: 4.3.2.2~32 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=44307678912a3b7b5a3222b4929976b8e229546b;p=rocksndiamonds.git changed setting flag to continue playing next level from hall of fame --- diff --git a/src/game.c b/src/game.c index ca2fa98e..aff7972a 100644 --- a/src/game.c +++ b/src/game.c @@ -5050,6 +5050,8 @@ void GameEnd(void) if (setup.auto_play_next_level) { + scores.continue_playing = TRUE; + LoadLevel(level_nr); SaveLevelSetup_SeriesInfo(); @@ -5062,9 +5064,7 @@ void GameEnd(void) DrawHallOfFame(last_level_nr); } - else if (setup.auto_play_next_level && setup.increment_levels && - last_level_nr < leveldir_current->last_level && - !network_playing) + else if (scores.continue_playing) { StartGameActions(network.enabled, setup.autorecord, level.random_seed); } diff --git a/src/screens.c b/src/screens.c index 1450e518..e2308b4d 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1721,6 +1721,9 @@ void DrawMainMenu(void) return; } + // reset flag to continue playing next level from hall of fame + scores.continue_playing = FALSE; + // leveldir_current may be invalid (level group, parent link, node copy) leveldir_current = getValidLevelSeries(leveldir_current, leveldir_last_valid); @@ -4342,9 +4345,6 @@ static void DrawChooseTree(TreeInfo **ti_ptr) boolean restart_music = (game_status != game_status_last_screen && game_status_last_screen != GAME_MODE_SCOREINFO); - scores.continue_playing = (game_status == GAME_MODE_SCORES && - game_status_last_screen == GAME_MODE_PLAYING); - if (CheckFadeAll()) fade_mask = REDRAW_ALL;