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 cbb9a0106c09889d5c0749891d3cc41607193a7f..bf2df8262203372817fe59c7ea22ed77e3a969ad 100644 (file)
--- 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 62492d1052bd7fcce507d424e7dbd948055add27..c2aafc005d7668ba35ba6d4568b8598ab2f683a7 100644 (file)
--- 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 57f7a4bcd35035605ddaaecacff1156370eaba5b..00a6d19c0654ee0f42e91370c17108e3939d7852 100644 (file)
--- 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 d649a76dfa214cf866019b48b97bb7ecce6d533b..e08e1be41bf0aacc1079218ae4bd83a39feb8e2f 100644 (file)
--- 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 e2298073706e56c09534db931d86f4f3a32e8b30..452381468b245d31f9141847ea7e56b544f60677 100644 (file)
--- 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