From 63748e53813da194a4086bbb84d6419171cc5c9e Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 12 Dec 2017 05:13:49 +0000
Subject: [PATCH] New LOGO_FLAGS bits: - LOGO_STOPMISCSOUNDS = 2097152: Don't
 play NITEVISION_ONOFF when the logo starts. - LOGO_NOGAMETITLE = 4194304:
 Don't display the title (INGAMEDUKETHREEDEE and PLUTOPAKSPRITE+2) in the main
 menu. - LOGO_NOTITLEBAR = 8388608: Don't display the title bar background
 (TITLEBAR) above the menu.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6555 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/game.h      |  3 +++
 source/duke3d/src/menus.cpp   | 12 ++++++++----
 source/duke3d/src/screens.cpp |  3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h
index 3df7edd7a..e7206bf3d 100644
--- a/source/duke3d/src/game.h
+++ b/source/duke3d/src/game.h
@@ -93,6 +93,9 @@ enum LogoFlags_t {
     LOGO_NOE3RADLOGO       = 0x00040000,
     LOGO_NODUKETEAMTEXT    = 0x00080000,
     LOGO_NODUKETEAMPIC     = 0x00100000,
+    LOGO_STOPMISCSOUNDS    = 0x00200000,
+    LOGO_NOGAMETITLE       = 0x00400000,
+    LOGO_NOTITLEBAR        = 0x00800000,
 };
 
 void A_DeleteSprite(int spriteNum);
diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp
index 64606b9ec..254e610d8 100644
--- a/source/duke3d/src/menus.cpp
+++ b/source/duke3d/src/menus.cpp
@@ -120,7 +120,8 @@ static void Menu_DrawBackground(const vec2_t origin)
 
 static void Menu_DrawTopBar(const vec2_t origin)
 {
-    rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + (19<<16), MF_Redfont.cursorScale, 0,MENUBAR,16,0,10);
+    if ((G_GetLogoFlags() & LOGO_NOTITLEBAR) == 0)
+        rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + (19<<16), MF_Redfont.cursorScale, 0,MENUBAR,16,0,10);
 }
 
 static void Menu_DrawTopBarCaption(const char *caption, const vec2_t origin)
@@ -2034,9 +2035,12 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
         l += 4;
         fallthrough__;
     case MENU_MAIN:
-        rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + ((28+l)<<16), 65536L,0,INGAMEDUKETHREEDEE,0,0,10);
-        if (PLUTOPAK)   // JBF 20030804
-            rotatesprite_fs(origin.x + ((MENU_MARGIN_CENTER+100)<<16), origin.y + (36<<16), 65536L,0,PLUTOPAKSPRITE+2,(sintable[(totalclock<<4)&2047]>>11),0,2+8);
+        if ((G_GetLogoFlags() & LOGO_NOGAMETITLE) == 0)
+        {
+            rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + ((28+l)<<16), 65536L,0,INGAMEDUKETHREEDEE,0,0,10);
+            if (PLUTOPAK)   // JBF 20030804
+                rotatesprite_fs(origin.x + ((MENU_MARGIN_CENTER+100)<<16), origin.y + (36<<16), 65536L,0,PLUTOPAKSPRITE+2,(sintable[(totalclock<<4)&2047]>>11),0,2+8);
+        }
         break;
 
     case MENU_PLAYER:
diff --git a/source/duke3d/src/screens.cpp b/source/duke3d/src/screens.cpp
index 43eb587be..b1c4c315e 100644
--- a/source/duke3d/src/screens.cpp
+++ b/source/duke3d/src/screens.cpp
@@ -1655,7 +1655,8 @@ void G_DisplayLogo(void)
 
     //g_player[myconnectindex].ps->palette = palette;
     P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0);    // JBF 20040308
-    S_PlaySound(NITEVISION_ONOFF);
+    if ((G_GetLogoFlags() & LOGO_STOPMISCSOUNDS) == 0)
+        S_PlaySound(NITEVISION_ONOFF);
 
     //G_FadePalette(0,0,0,0);
     clearallviews(0L);