projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added (and set) identifier and level number to global levelset structure
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 9deb974cc553d439dc8279ff8e45e61f22b5c28f..4ee8179d68dc4a564f6349415908df02d2f802a6 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1591,6
+1591,8
@@
void DrawMainMenu()
init_last = init; /* switch to new busy animation */
init_last = init; /* switch to new busy animation */
+ SetLevelSetInfo(leveldir_current->identifier, level_nr);
+
/* needed if last screen (level choice) changed graphics, sounds or music */
ReloadCustomArtwork(0);
/* needed if last screen (level choice) changed graphics, sounds or music */
ReloadCustomArtwork(0);
@@
-4630,16
+4632,17
@@
void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
FadeSound(SND_BACKGROUND_SCORES);
FadeSound(SND_BACKGROUND_SCORES);
- if (game_status_last_screen != GAME_MODE_PLAYING ||
- !setup.auto_play_next_level || !setup.increment_levels)
+ if (game_status_last_screen == GAME_MODE_PLAYING &&
+ setup.auto_play_next_level && setup.increment_levels &&
+ !network_playing)
{
{
- SetGameStatus(GAME_MODE_MAIN);
-
- DrawMainMenu();
+ StartGameActions(network.enabled, setup.autorecord, level.random_seed);
}
else
{
}
else
{
- StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+ SetGameStatus(GAME_MODE_MAIN);
+
+ DrawMainMenu();
}
}
}
}