static void DrawChooseTree(TreeInfo **ti_ptr)
{
int fade_mask = REDRAW_FIELD;
+ boolean restart_music = (game_status != game_status_last_screen &&
+ game_status_last_screen != GAME_MODE_SCOREINFO);
if (CheckFadeAll())
fade_mask = REDRAW_ALL;
FreeScreenGadgets();
CreateScreenGadgets();
- if (game_status != game_status_last_screen)
+ if (restart_music)
FadeMenuSoundsAndMusic();
FadeOut(fade_mask);
DrawMaskedBorder(fade_mask);
- if (game_status != game_status_last_screen)
+ if (restart_music)
PlayMenuSoundsAndMusic();
FadeIn(fade_mask);
{
int num_entries = numTreeInfoInGroup(ti);
boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN);
+ boolean scrollbar_always = (game_status == GAME_MODE_SCORES);
+ boolean scrollbar_keep_space = (scrollbar_needed || scrollbar_always);
int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
- int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE);
+ int screen_width = (scrollbar_keep_space ? scrollbar_xpos : SXSIZE);
int first_entry = ti->cl_first;
int entry_pos = first_entry + y;
TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti);
static void DrawHallOfFame_setScoreEntries(void)
{
- int num_visible_score_entries = NUM_MENU_ENTRIES_ON_SCREEN - 1;
+ int max_empty_entries = 10; // at least show "top ten" list, if empty
+ int max_visible_entries = NUM_MENU_ENTRIES_ON_SCREEN - 1; // w/o back link
+ int min_score_entries = MIN(max_empty_entries, max_visible_entries);
int score_pos = (scores.last_added >= 0 ? scores.last_added : 0);
int i;
// do not add empty score entries if off-screen
if (scores.entry[i].score == 0 &&
scores.entry[i].time == 0 &&
- i >= num_visible_score_entries)
+ i >= min_score_entries)
break;
TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_SCORE_ENTRY);
PlaySound(SND_MENU_ITEM_SELECTING);
scores.last_level_nr = level_nr = new_level_nr;
+ scores.last_entry_nr = 0;
LoadLevel(level_nr);
LoadLocalAndServerScore(level_nr, TRUE);
}
else
{
- scores.last_entry_nr = 0;
-
DrawScoreInfo_Content(scores.last_entry_nr);
}