projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup of high score data structures
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 601c05de45e3ff278c40ea8e637e5d7960caa8ab..d1629867c96a2668cb0f1f282e4c54ab04c64936 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-2165,6
+2165,9
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
SaveLevelSetup_LastSeries();
SaveLevelSetup_SeriesInfo();
SaveLevelSetup_LastSeries();
SaveLevelSetup_SeriesInfo();
+ // restore level set if chosen from "last played level set" menu
+ RestoreLastPlayedLevels(&leveldir_current);
+
if (setup.internal.choose_from_top_leveldir)
gotoTopLevelDir();
if (setup.internal.choose_from_top_leveldir)
gotoTopLevelDir();
@@
-4855,6
+4858,11
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
HandleMainMenu_SelectLevel(0, 0, new_level_nr);
}
HandleMainMenu_SelectLevel(0, 0, new_level_nr);
}
+ else if (game_status == GAME_MODE_LEVELS)
+ {
+ // store level set if chosen from "last played level set" menu
+ StoreLastPlayedLevels(leveldir_current);
+ }
else if (game_status == GAME_MODE_NAMES)
{
if (mx >= sx1_edit_name && mx <= sx2_edit_name)
else if (game_status == GAME_MODE_NAMES)
{
if (mx >= sx1_edit_name && mx <= sx2_edit_name)
@@
-5102,10
+5110,10
@@
static void drawHallOfFameList(int level_nr, int first_entry,
for (j = 0; j < num_dots; j++)
DrawText(mSX + dx2 + j * getFontWidth(font_nr3), sy, ".", font_nr3);
for (j = 0; j < num_dots; j++)
DrawText(mSX + dx2 + j * getFontWidth(font_nr3), sy, ".", font_nr3);
- if (!strEqual(
highscore[entry].N
ame, EMPTY_PLAYER_NAME))
- DrawText(mSX + dx2, sy,
highscore[entry].N
ame, font_nr2);
+ if (!strEqual(
scores.entry[entry].n
ame, EMPTY_PLAYER_NAME))
+ DrawText(mSX + dx2, sy,
scores.entry[entry].n
ame, font_nr2);
- DrawText(mSX + dx3, sy, int2str(
highscore[entry].S
core, 5), font_nr4);
+ DrawText(mSX + dx3, sy, int2str(
scores.entry[entry].s
core, 5), font_nr4);
}
redraw_mask |= REDRAW_FIELD;
}
redraw_mask |= REDRAW_FIELD;