projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0105036
)
moved fading and playing sounds and music for "choose tree" screens
author
Holger Schemel
<info@artsoft.org>
Tue, 15 Feb 2022 17:24:18 +0000
(18:24 +0100)
committer
Holger Schemel
<info@artsoft.org>
Tue, 15 Feb 2022 17:24:18 +0000
(18:24 +0100)
src/screens.c
patch
|
blob
|
history
diff --git
a/src/screens.c
b/src/screens.c
index 2c692c16207b175499c3110752fd3c3d74071245..750aaae4c57819939d5f5a92fc4ae00fcbf9a3e7 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-4832,6
+4832,9
@@
static void DrawChooseTree(TreeInfo **ti_ptr)
FreeScreenGadgets();
CreateScreenGadgets();
FreeScreenGadgets();
CreateScreenGadgets();
+ if (game_status != game_status_last_screen)
+ FadeMenuSoundsAndMusic();
+
FadeOut(fade_mask);
// needed if different viewport properties defined for choosing level (set)
FadeOut(fade_mask);
// needed if different viewport properties defined for choosing level (set)
@@
-4853,6
+4856,9
@@
static void DrawChooseTree(TreeInfo **ti_ptr)
DrawMaskedBorder(fade_mask);
DrawMaskedBorder(fade_mask);
+ if (game_status != game_status_last_screen)
+ PlayMenuSoundsAndMusic();
+
FadeIn(fade_mask);
}
FadeIn(fade_mask);
}
@@
-5360,8
+5366,6
@@
void DrawChoosePlayerName(void)
{
int i;
{
int i;
- FadeMenuSoundsAndMusic();
-
if (player_name != NULL)
{
freeTreeInfo(player_name);
if (player_name != NULL)
{
freeTreeInfo(player_name);
@@
-5401,8
+5405,6
@@
void DrawChoosePlayerName(void)
player_name_current = player_name;
DrawChooseTree(&player_name_current);
player_name_current = player_name;
DrawChooseTree(&player_name_current);
-
- PlayMenuSoundsAndMusic();
}
void HandleChoosePlayerName(int mx, int my, int dx, int dy, int button)
}
void HandleChoosePlayerName(int mx, int my, int dx, int dy, int button)
@@
-5412,11
+5414,7
@@
void HandleChoosePlayerName(int mx, int my, int dx, int dy, int button)
void DrawChooseLevelSet(void)
{
void DrawChooseLevelSet(void)
{
- FadeMenuSoundsAndMusic();
-
DrawChooseTree(&leveldir_current);
DrawChooseTree(&leveldir_current);
-
- PlayMenuSoundsAndMusic();
}
void HandleChooseLevelSet(int mx, int my, int dx, int dy, int button)
}
void HandleChooseLevelSet(int mx, int my, int dx, int dy, int button)
@@
-5428,8
+5426,6
@@
void DrawChooseLevelNr(void)
{
int i;
{
int i;
- FadeMenuSoundsAndMusic();
-
if (level_number != NULL)
{
freeTreeInfo(level_number);
if (level_number != NULL)
{
freeTreeInfo(level_number);
@@
-5475,8
+5471,6
@@
void DrawChooseLevelNr(void)
level_number_current = level_number;
DrawChooseTree(&level_number_current);
level_number_current = level_number;
DrawChooseTree(&level_number_current);
-
- PlayMenuSoundsAndMusic();
}
void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
}
void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)