From: Holger Schemel <info@artsoft.org>
Date: Mon, 1 May 2006 23:48:35 +0000 (+0200)
Subject: rnd-20060502-1-src
X-Git-Tag: 3.2.0^2~24
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=ec942b1c9df306ed468fdc42ba3b5f7f0d9b330f;p=rocksndiamonds.git

rnd-20060502-1-src
* fixed small bug that caused door sounds playing when music is enabled
---

diff --git a/ChangeLog b/ChangeLog
index 93062e35..d384efea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2006-04-30
 	* fixed bug that forced re-defining of menu settings in local graphics
 	  config file which are already defined in existing base config file
+	* fixed small bug that caused door sounds playing when music is enabled
 
 2006-04-29
 	* added the possibility to define up to five title screens for each
diff --git a/src/conftime.h b/src/conftime.h
index a18f9ffe..b1391284 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-04-30 17:49]"
+#define COMPILE_DATE_STRING "[2006-05-02 01:42]"
diff --git a/src/screens.c b/src/screens.c
index fb264ac4..6dc45883 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -265,12 +265,14 @@ void DrawTitleScreenImage(int nr)
 
   if (width > WIN_XSIZE)
   {
+    /* image width too large for window => center image horizontally */
     src_x = (width - WIN_XSIZE) / 2;
     width = WIN_XSIZE;
   }
 
   if (height > WIN_YSIZE)
   {
+    /* image height too large for window => center image vertically */
     src_y = (height - WIN_YSIZE) / 2;
     height = WIN_YSIZE;
   }
@@ -565,8 +567,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   boolean return_to_main_menu = FALSE;
   boolean use_fading_main_menu = TRUE;
   boolean use_cross_fading = TRUE;
-  int fade_delay = 1000;
-  int post_delay = 500;
+  int fade_delay = 500;
+  int post_delay = fade_delay / 2;
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -609,6 +611,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     }
     else
     {
+      FadeSoundsAndMusic();
+
       FadeOut(fade_delay, post_delay);
 
       return_to_main_menu = TRUE;