From ca218529457432665b5268c8032fca0989fdfc0c Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 2 Feb 2020 20:44:57 +0100
Subject: [PATCH] - hook up -nologo.

---
 source/duke3d/src/screens.cpp |  4 ++--
 source/rr/src/screens.cpp     | 12 ++++++------
 source/sw/src/game.cpp        |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/source/duke3d/src/screens.cpp b/source/duke3d/src/screens.cpp
index 11f9d003f..a0036be52 100644
--- a/source/duke3d/src/screens.cpp
+++ b/source/duke3d/src/screens.cpp
@@ -1153,7 +1153,7 @@ void G_DisplayExtraScreens(void)
 
 void gameDisplay3DRScreen()
 {
-    if (!inputState.CheckAllInput() && g_noLogoAnim == 0)
+    if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
     {
         Net_GetPackets();
 
@@ -1325,7 +1325,7 @@ void G_DisplayLogo(void)
     FX_StopAllSounds(); // JBF 20031228
     S_ClearSoundLocks();  // JBF 20031228
 
-    if (!g_noLogo /* && (!g_netServer && ud.multimode < 2) */ &&
+    if (!g_noLogo && !userConfig.nologo /* && (!g_netServer && ud.multimode < 2) */ &&
         VM_OnEventWithReturn(EVENT_MAINMENUSCREEN, g_player[myconnectindex].ps->i, myconnectindex, 0) == 0 &&
         (logoflags & LOGO_ENABLED))
     {
diff --git a/source/rr/src/screens.cpp b/source/rr/src/screens.cpp
index 6a1182814..0814afeb7 100644
--- a/source/rr/src/screens.cpp
+++ b/source/rr/src/screens.cpp
@@ -1170,7 +1170,7 @@ void G_DisplayLogo(void)
         return;
     if (RR)
     {
-        if (!inputState.CheckAllInput() && g_noLogoAnim == 0)
+        if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
         {
             Net_GetPackets();
             Anim_Play("rr_intro.anm");
@@ -1183,7 +1183,7 @@ void G_DisplayLogo(void)
         FX_StopAllSounds();
         S_ClearSoundLocks();
 
-        if (!inputState.CheckAllInput() && g_noLogoAnim == 0)
+        if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
         {
             Net_GetPackets();
             Anim_Play("redneck.anm");
@@ -1196,7 +1196,7 @@ void G_DisplayLogo(void)
         FX_StopAllSounds();
         S_ClearSoundLocks();
 
-        if (!inputState.CheckAllInput() && g_noLogoAnim == 0)
+        if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
         {
             Net_GetPackets();
             Anim_Play("xatlogo.anm");
@@ -1217,13 +1217,13 @@ void G_DisplayLogo(void)
         videoClearScreen(0L);
         return;
     }
-    if (!g_noLogo /* && (!g_netServer && ud.multimode < 2) */)
+    if (!g_noLogo && !userConfig.nologo /* && (!g_netServer && ud.multimode < 2) */)
     {
 #ifndef EDUKE32_TOUCH_DEVICES
         if (VOLUMEALL)
 #endif
         {
-            if (!inputState.CheckAllInput() && g_noLogoAnim == 0)
+            if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
             {
                 Net_GetPackets();
                 Anim_Play("logo.anm");
@@ -1242,7 +1242,7 @@ void G_DisplayLogo(void)
         //g_player[myconnectindex].ps->palette = drealms;
         //G_FadePalette(0,0,0,252);
 
-        if (!inputState.CheckAllInput() && g_noLogoAnim == 0)
+        if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
         {
             Net_GetPackets();
 
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index b6c61e0fa..b5e8a6ce2 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -1438,6 +1438,7 @@ void LogoLevel(void)
     char called;
     int fin;
 
+    if (userConfig.nologo) return;
     DSPRINTF(ds,"LogoLevel...");
     MONO_PRINT(ds);
 
@@ -1690,6 +1691,7 @@ short PlayerQuitMenuLevel = -1;
 
 void IntroAnimLevel(void)
 {
+    if (userConfig.nologo) return;
     DSPRINTF(ds,"IntroAnimLevel");
     MONO_PRINT(ds);
     playanm(0);