boolean restart_music = (game_status != game_status_last_screen &&
game_status_last_screen != GAME_MODE_SCOREINFO);
+ scores.continue_on_return = (game_status == GAME_MODE_SCORES &&
+ game_status_last_screen == GAME_MODE_PLAYING);
+
if (CheckFadeAll())
fade_mask = REDRAW_ALL;
{
execSetupArtwork();
}
- else // GAME_MODE_LEVELS
+ else if (game_status == GAME_MODE_SCORES && scores.continue_playing)
+ {
+ StartPlayingFromHallOfFame();
+ }
+ else
{
SetGameStatus(GAME_MODE_MAIN);
}
#if defined(PLATFORM_ANDROID)
- // touching the screen anywhere continues playing the next level
- if ((mx || my) && scores.continue_playing)
+ // directly continue when touching the screen after playing
+ if ((mx || my) && scores.continue_on_return)
{
+ // ignore touch events until released
mx = my = 0;
- button = MB_MENU_CHOICE;
}
#endif
return;
}
}
- else if (dx == -1 && ti->node_parent)
+ else if ((dx == -1 || button == MB_MENU_CONTINUE) && ti->node_parent)
{
- FadeSetLeaveMenu();
+ if (game_status != GAME_MODE_SCORES)
+ FadeSetLeaveMenu();
PlaySound(SND_MENU_ITEM_SELECTING);
*ti_ptr = ti->node_parent;
-
DrawChooseTree(ti_ptr);
return;
if (score_entry_current == NULL)
score_entry_current = getFirstValidTreeInfoEntry(score_entries);
+ if (score_entries != NULL && scores.continue_playing)
+ setString(&score_entries->node_group->name, BACKLINK_TEXT_NEXT);
+
// ("score_entries" and "score_entry_current" may be NULL here)
}
void DrawHallOfFame(int nr)
{
scores.last_level_nr = nr;
- scores.continue_on_return = (game_status_last_screen == GAME_MODE_PLAYING);
// (this is needed when called from GameEnd() after winning a game)
KeyboardAutoRepeatOn();