From: Holger Schemel Date: Tue, 15 Feb 2022 17:24:18 +0000 (+0100) Subject: moved fading and playing sounds and music for "choose tree" screens X-Git-Tag: 4.3.2.0~125 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=fb150222e69db8992dd96552cb938e65a473a7b9;p=rocksndiamonds.git moved fading and playing sounds and music for "choose tree" screens --- diff --git a/src/screens.c b/src/screens.c index 2c692c16..750aaae4 100644 --- a/src/screens.c +++ b/src/screens.c @@ -4832,6 +4832,9 @@ static void DrawChooseTree(TreeInfo **ti_ptr) FreeScreenGadgets(); CreateScreenGadgets(); + if (game_status != game_status_last_screen) + FadeMenuSoundsAndMusic(); + 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); + if (game_status != game_status_last_screen) + PlayMenuSoundsAndMusic(); + FadeIn(fade_mask); } @@ -5360,8 +5366,6 @@ void DrawChoosePlayerName(void) { int i; - FadeMenuSoundsAndMusic(); - if (player_name != NULL) { freeTreeInfo(player_name); @@ -5401,8 +5405,6 @@ void DrawChoosePlayerName(void) player_name_current = player_name; DrawChooseTree(&player_name_current); - - PlayMenuSoundsAndMusic(); } 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) { - FadeMenuSoundsAndMusic(); - DrawChooseTree(&leveldir_current); - - PlayMenuSoundsAndMusic(); } void HandleChooseLevelSet(int mx, int my, int dx, int dy, int button) @@ -5428,8 +5426,6 @@ void DrawChooseLevelNr(void) { int i; - FadeMenuSoundsAndMusic(); - if (level_number != NULL) { freeTreeInfo(level_number); @@ -5475,8 +5471,6 @@ void DrawChooseLevelNr(void) level_number_current = level_number; DrawChooseTree(&level_number_current); - - PlayMenuSoundsAndMusic(); } void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)