From: Holger Schemel Date: Wed, 11 May 2022 11:29:12 +0000 (+0200) Subject: renamed variable X-Git-Tag: 4.3.2.2~33 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=19368085952eb82c094767bf6d356963aaee50a0;p=rocksndiamonds.git renamed variable --- diff --git a/src/files.c b/src/files.c index d72bcfae..919b7f85 100644 --- a/src/files.c +++ b/src/files.c @@ -8693,7 +8693,7 @@ static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores) // The following values are intentionally not reset here: // - last_level_nr // - last_entry_nr - // - was_just_playing + // - continue_playing } static void setScoreInfoToDefaults(void) diff --git a/src/main.h b/src/main.h index 83cbf65e..cff7ff79 100644 --- a/src/main.h +++ b/src/main.h @@ -3128,7 +3128,7 @@ struct ScoreInfo boolean uploaded; boolean tape_downloaded; boolean force_last_added; - boolean was_just_playing; + boolean continue_playing; struct ScoreEntry entry[MAX_SCORE_ENTRIES]; }; diff --git a/src/screens.c b/src/screens.c index cba644ac..1450e518 100644 --- a/src/screens.c +++ b/src/screens.c @@ -4342,7 +4342,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr) boolean restart_music = (game_status != game_status_last_screen && game_status_last_screen != GAME_MODE_SCOREINFO); - scores.was_just_playing = (game_status == GAME_MODE_SCORES && + scores.continue_playing = (game_status == GAME_MODE_SCORES && game_status_last_screen == GAME_MODE_PLAYING); if (CheckFadeAll()) @@ -4799,7 +4799,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, #if defined(PLATFORM_ANDROID) // touching the screen anywhere continues playing the next level - if ((mx || my) && scores.was_just_playing) + if ((mx || my) && scores.continue_playing) { mx = my = 0; button = MB_MENU_CHOICE; @@ -4807,9 +4807,9 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, #endif // any mouse click or direction input stops playing the next level - if ((mx || my || dx || dy) && scores.was_just_playing) + if ((mx || my || dx || dy) && scores.continue_playing) { - scores.was_just_playing = FALSE; + scores.continue_playing = FALSE; level_nr = scores.last_level_nr; LoadLevel(level_nr); } @@ -5094,14 +5094,14 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { if (setup.auto_play_next_level && setup.increment_levels && scores.last_level_nr < leveldir_current->last_level && - scores.was_just_playing && + scores.continue_playing && !network_playing) { StartGameActions(network.enabled, setup.autorecord, level.random_seed); return; } - else if (!scores.was_just_playing) + else if (!scores.continue_playing) { SetGameStatus(GAME_MODE_SCOREINFO);