fix bingo win with inventory open crash

Die4Ever · Sep 7, 2023 · cee2f0f · cee2f0f
1 parent 075f831
commit cee2f0f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 31 deletions.
diff --git a/DXRCore/DeusEx/Classes/DXRBase.uc b/DXRCore/DeusEx/Classes/DXRBase.uc
@@ -489,6 +489,34 @@ simulated function MessageBoxClicked(int button, int callbackId) {
     //OK = 2
 }
 
+//Returns true when you aren't in a menu, or in the intro, etc.
+function bool InGame() {
+#ifdef hx
+    return true;
+#endif
+
+    if( player() == None )
+        return false;
+
+    if (player().InConversation()) {
+        return True;
+    }
+
+    if (None == DeusExRootWindow(player().rootWindow)) {
+        return False;
+    }
+
+    if (None == DeusExRootWindow(player().rootWindow).hud) {
+        return False;
+    }
+
+    if (!DeusExRootWindow(player().rootWindow).hud.isVisible()){
+        return False;
+    }
+
+    return True;
+}
+
 simulated function AddDXRCredits(CreditsWindow cw)
 {
 }
diff --git a/DXRModules/DeusEx/Classes/DXREvents.uc b/DXRModules/DeusEx/Classes/DXREvents.uc
@@ -1196,9 +1196,12 @@ function BingoWinScreen()
     p.ReducedDamageType = 'All';// god mode
     p.DesiredFlashScale = 0;
     p.DesiredFlashFog = vect(0,0,0);
-    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");
+
+    if(InGame()) {
+        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");
+    }
     if (bingo_win_countdown == 2 && !#defined(vanilla)) {
         //Give it 2 seconds to send the tweet
         //This is still needed outside of vanilla

diff --git a/DXRModules/DeusEx/Classes/DXRStats.uc b/DXRModules/DeusEx/Classes/DXRStats.uc
@@ -48,34 +48,6 @@ simulated function ReEntry(bool IsTravel)
     }
 }
 
-//Returns true when you aren't in a menu, or in the intro, etc.
-function bool InGame() {
-#ifdef hx
-    return true;
-#endif
-
-    if( player() == None )
-        return false;
-
-    if (player().InConversation()) {
-        return True;
-    }
-
-    if (None == DeusExRootWindow(player().rootWindow)) {
-        return False;
-    }
-
-    if (None == DeusExRootWindow(player().rootWindow).hud) {
-        return False;
-    }
-
-    if (!DeusExRootWindow(player().rootWindow).hud.isVisible()){
-        return False;
-    }
-
-    return True;
-}
-
 function IncMissionTimer(int mission)
 {
     local string flagname, dataname;