From 678c272c687c9e3f6a8eb99cec2b453a5d852901 Mon Sep 17 00:00:00 2001
From: "theastropath@gmail.com" <theastropath@gmail.com>
Date: Sun, 10 Sep 2023 12:28:26 -0400
Subject: [PATCH] Move the DXRBigMessage check out of the DXRBase logic and
 specifically into the BingoWinScreen checks

---
 DXRCore/DeusEx/Classes/DXRBase.uc      |  7 -------
 DXRModules/DeusEx/Classes/DXREvents.uc | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/DXRCore/DeusEx/Classes/DXRBase.uc b/DXRCore/DeusEx/Classes/DXRBase.uc
index 2d3f3a208..56dfe3b90 100644
--- a/DXRCore/DeusEx/Classes/DXRBase.uc
+++ b/DXRCore/DeusEx/Classes/DXRBase.uc
@@ -506,13 +506,6 @@ function bool InGame() {
         return False;
     }
 
-    //Consider it in-game if a big message is up...
-    if (DeusExRootWindow(player().rootWindow).GetTopWindow()!=None){
-        if (DeusExRootWindow(player().rootWindow).GetTopWindow().IsA('DXRBigMessage')){
-            return True;
-        }
-    }
-
     if (None == DeusExRootWindow(player().rootWindow).hud) {
         return False;
     }
diff --git a/DXRModules/DeusEx/Classes/DXREvents.uc b/DXRModules/DeusEx/Classes/DXREvents.uc
index f03fd5ab9..c46b43dd9 100644
--- a/DXRModules/DeusEx/Classes/DXREvents.uc
+++ b/DXRModules/DeusEx/Classes/DXREvents.uc
@@ -1303,6 +1303,8 @@ function PreTravel()
 function BingoWinScreen()
 {
     local #var(PlayerPawn) p;
+    local bool showMsg;
+
     p = player();
     if ( Level.Netmode == NM_Standalone ) {
         //Make it harder to get murdered during the countdown
@@ -1313,7 +1315,19 @@ function BingoWinScreen()
     p.DesiredFlashScale = 0;
     p.DesiredFlashFog = vect(0,0,0);
 
-    if(InGame()) {
+    showMsg=False;
+    if (InGame()){
+        showMsg=True;
+    } else {
+        //Consider it in-game if a big message is up...
+        if (DeusExRootWindow(p.rootWindow).GetTopWindow()!=None){
+            if (DeusExRootWindow(p.rootWindow).GetTopWindow().IsA('DXRBigMessage')){
+                showMsg = True;
+            }
+        }
+    }
+
+    if(showMsg) {
         p.ShowHud(False);
         //Show win message
         class'DXRBigMessage'.static.CreateBigMessage(dxr.player,None,"Congratulations!  You finished your bingo!","Game ending in "$bingo_win_countdown$" seconds");