projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed playing "game.losing" sound also if not asking to play again
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 15dc1a737d1a3d12d7a874b57eb8800e5b4f8d88..eecb688b937aa681e9f1d78ab93e24de931a1ba0 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-3268,6
+3268,8
@@
static void DrawInfoScreen_TitleScreen(void)
{
SetGameStatus(GAME_MODE_TITLE);
{
SetGameStatus(GAME_MODE_TITLE);
+ UnmapAllGadgets();
+
DrawTitleScreen();
}
DrawTitleScreen();
}
@@
-3280,6
+3282,7
@@
static void DrawInfoScreen_Elements(void)
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
@@
-3382,6
+3385,8
@@
static void DrawInfoScreen_Music(void)
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
+ UnmapAllGadgets();
+
FadeOut(REDRAW_FIELD);
ClearField();
FadeOut(REDRAW_FIELD);
ClearField();
@@
-3591,6
+3596,7
@@
static void DrawInfoScreen_Version(void)
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
@@
-3892,6
+3898,7
@@
static void DrawInfoScreen_Generic(void)
{
SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic());
{
SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic());
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
@@
-5111,6
+5118,9
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
{
// store level set if chosen from "last played level set" menu
StoreLastPlayedLevels(leveldir_current);
{
// store level set if chosen from "last played level set" menu
StoreLastPlayedLevels(leveldir_current);
+
+ // store if level set chosen from "last played level set" menu
+ SaveLevelSetup_LastSeries();
}
else if (game_status == GAME_MODE_NAMES)
{
}
else if (game_status == GAME_MODE_NAMES)
{
@@
-9517,8
+9527,7
@@
void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
void HandleGameActions(void)
{
void HandleGameActions(void)
{
- if (setup.ask_on_game_over)
- CheckGameOver();
+ CheckGameOver();
if (game.restart_game_message != NULL)
{
if (game.restart_game_message != NULL)
{