X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=326fa677c0973404caa4abd28f6dfb97b7746e92;hb=d522e996ec9a28cd01c056764799996a4ac5474e;hp=53ac39a7e8911e8d3af97091f7819af2073ff1b4;hpb=c20136c10315df9e66a56f97db11023306032604;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 53ac39a7..326fa677 100644 --- a/src/screens.c +++ b/src/screens.c @@ -4362,7 +4362,11 @@ static void DrawChooseTree(TreeInfo **ti_ptr) { execSetupArtwork(); } - else // GAME_MODE_LEVELS + else if (game_status == GAME_MODE_SCORES && scores.continue_playing) + { + StartPlayingFromHallOfFame(); + } + else { SetGameStatus(GAME_MODE_MAIN); @@ -4908,14 +4912,14 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, 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; @@ -5307,6 +5311,9 @@ static void DrawHallOfFame_setScoreEntries(void) if (score_entry_current == NULL) score_entry_current = getFirstValidTreeInfoEntry(score_entries); + if (score_entries != NULL && scores.last_added >= 0) + setString(&score_entries->node_group->name, BACKLINK_TEXT_NEXT); + // ("score_entries" and "score_entry_current" may be NULL here) }