projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0dad0e3
)
fixed using same background music for hall of fame and score info page
author
Holger Schemel
<info@artsoft.org>
Sat, 19 Mar 2022 09:42:27 +0000
(10:42 +0100)
committer
Holger Schemel
<info@artsoft.org>
Sat, 19 Mar 2022 09:42:27 +0000
(10:42 +0100)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index f62d84fbe1cdefadf8fddd874d0c852be3c2f035..8f893cbfb4c28e149bc037797c23635cf2ae0c14 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-4833,6
+4833,8
@@
static int getAlignYOffsetFromTreeInfo(TreeInfo *ti)
static void DrawChooseTree(TreeInfo **ti_ptr)
{
int fade_mask = REDRAW_FIELD;
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;
if (CheckFadeAll())
fade_mask = REDRAW_ALL;
@@
-4858,7
+4860,7
@@
static void DrawChooseTree(TreeInfo **ti_ptr)
FreeScreenGadgets();
CreateScreenGadgets();
FreeScreenGadgets();
CreateScreenGadgets();
- if (
game_status != game_status_last_screen
)
+ if (
restart_music
)
FadeMenuSoundsAndMusic();
FadeOut(fade_mask);
FadeMenuSoundsAndMusic();
FadeOut(fade_mask);
@@
-4889,7
+4891,7
@@
static void DrawChooseTree(TreeInfo **ti_ptr)
DrawMaskedBorder(fade_mask);
DrawMaskedBorder(fade_mask);
- if (
game_status != game_status_last_screen
)
+ if (
restart_music
)
PlayMenuSoundsAndMusic();
FadeIn(fade_mask);
PlayMenuSoundsAndMusic();
FadeIn(fade_mask);