From: Holger Schemel <info@artsoft.org>
Date: Sat, 2 Dec 2006 15:29:14 +0000 (+0100)
Subject: rnd-20061202-1-src
X-Git-Tag: 3.2.3^2~7
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=c0e2983d4635cd19586b40991abbf8d38fd02c31

rnd-20061202-1-src
* fixed bug with displaying masked borders over title screens when
  screen fading is disabled
---

diff --git a/ChangeLog b/ChangeLog
index cbb9a010..bf2df826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-02
+	* fixed bug with displaying masked borders over title screens when
+	  screen fading is disabled
+
 2006-11-25
 	* fixed infinite loop / crash bug when killing the player while having
 	  a CE with the setting "kill player X when explosion of <player X>"
diff --git a/src/conftime.h b/src/conftime.h
index 62492d10..c2aafc00 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-11-25 15:47]"
+#define COMPILE_DATE_STRING "[2006-12-02 16:27]"
diff --git a/src/screens.c b/src/screens.c
index 57f7a4bc..00a6d19c 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -624,6 +624,14 @@ static int getTitleScreenGraphic()
 	  IMG_TITLESCREEN_1);
 }
 
+int effectiveGameStatus()
+{
+  if (game_status == GAME_MODE_INFO && info_mode == INFO_MODE_TITLE)
+    return GAME_MODE_TITLE;
+
+  return game_status;
+}
+
 void DrawTitleScreenImage(int nr)
 {
   int graphic = getTitleScreenGraphic() + nr;
diff --git a/src/screens.h b/src/screens.h
index d649a76d..e08e1be4 100644
--- a/src/screens.h
+++ b/src/screens.h
@@ -21,6 +21,8 @@
 #define SCROLL_PAGE	(2 * SCR_FIELDY)
 
 
+int effectiveGameStatus();
+
 void DrawMainMenuExt(int, boolean);
 void DrawAndFadeInMainMenu(int);
 void DrawMainMenu(void);
diff --git a/src/tools.c b/src/tools.c
index e2298073..45238146 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -19,6 +19,7 @@
 #include "cartoons.h"
 #include "network.h"
 #include "tape.h"
+#include "screens.h"
 
 
 /* select level set with EMC X11 graphics before activating EM GFX debugging */
@@ -240,6 +241,10 @@ void DrawMaskedBorder_ALL()
 
 void DrawMaskedBorder(int redraw_mask)
 {
+  /* do not draw masked screen borders when displaying title screens */
+  if (effectiveGameStatus() == GAME_MODE_TITLE)
+    return;
+
   if (redraw_mask & REDRAW_ALL)
     DrawMaskedBorder_ALL();
   else