From da834ee6bcec5d54604551941533e6901c7d9711 Mon Sep 17 00:00:00 2001
From: Die4Ever <die4ever2005@gmail.com>
Date: Sun, 22 Sep 2024 22:36:07 -0500
Subject: [PATCH] use #bool(debug) and #bool(locdebug)

---
 DXRCore/DeusEx/Classes/DXRActorsBase.uc  |  4 ++--
 DXRModules/DeusEx/Classes/DXRFlags.uc    |  2 +-
 DXRando/DeusEx/Classes/DXRAnimTracker.uc | 12 ++++++------
 DXRando/DeusEx/Classes/TriggerEnable.uc  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/DXRCore/DeusEx/Classes/DXRActorsBase.uc b/DXRCore/DeusEx/Classes/DXRActorsBase.uc
index 77c77d8c6..90d5bc942 100644
--- a/DXRCore/DeusEx/Classes/DXRActorsBase.uc
+++ b/DXRCore/DeusEx/Classes/DXRActorsBase.uc
@@ -1734,7 +1734,7 @@ static function Actor GlowUp(Actor a, optional byte hue, optional byte saturatio
 function DebugMarkKeyActor(Actor a, coerce string id)
 {
     local ActorDisplayWindow actorDisplay;
-    if( ! #defined(locdebug)) {
+    if( ! #bool(locdebug)) {
         err("Don't call DebugMarkKeyActor without locdebug mode! Add locdebug to the compiler_settings.default.json file");
         return;
     }
@@ -1760,7 +1760,7 @@ function DebugMarkKeyPosition(vector pos, coerce string id)
 {
     local ActorDisplayWindow actorDisplay;
     local Actor a;
-    if( ! #defined(locdebug)) {
+    if( ! #bool(locdebug)) {
         err("Don't call DebugMarkKeyPosition without locdebug mode! Add locdebug to the compiler_settings.default.json file");
         return;
     }
diff --git a/DXRModules/DeusEx/Classes/DXRFlags.uc b/DXRModules/DeusEx/Classes/DXRFlags.uc
index 830b20fe3..e81cfee27 100644
--- a/DXRModules/DeusEx/Classes/DXRFlags.uc
+++ b/DXRModules/DeusEx/Classes/DXRFlags.uc
@@ -39,7 +39,7 @@ simulated function PlayerAnyEntry(#var(PlayerPawn) p)
     p.bCrowdControl = (crowdcontrol!=0);
 #endif
 
-    if(!VersionIsStable() || #defined(debug))
+    if(!VersionIsStable() || #bool(debug))
         p.bCheatsEnabled = true;
 
     if(difficulty_names[difficulty] == "Super Easy QA" && dxr.dxInfo.missionNumber > 0 && dxr.dxInfo.missionNumber < 99) {
diff --git a/DXRando/DeusEx/Classes/DXRAnimTracker.uc b/DXRando/DeusEx/Classes/DXRAnimTracker.uc
index 9196c3d0d..8aac793da 100644
--- a/DXRando/DeusEx/Classes/DXRAnimTracker.uc
+++ b/DXRando/DeusEx/Classes/DXRAnimTracker.uc
@@ -44,8 +44,8 @@ function Init(string part)
     local rotator rot;
     local int a, i;
 
-    if(#defined(debug)) SaveConfig();// create/update the config file
-    if(#defined(debug) && part == config_part) return;
+    if(#bool(debug)) SaveConfig();// create/update the config file
+    if(#bool(debug) && part == config_part) return;
 
     for(a=0; a<ArrayCount(anim_offsets); a++) {
         anim_offsets[a].frames[0] = -1;
@@ -122,7 +122,7 @@ function Init(string part)
         break;
     }
 
-    if(#defined(debug)) SaveConfig();// write back new values to config
+    if(#bool(debug)) SaveConfig();// write back new values to config
 }
 
 function edit()
@@ -142,7 +142,7 @@ function edit()
 
     ForceFrame = Owner.AnimFrame;
 
-    if(!#defined(debug)) Human(GetPlayerPawn()).ClientMessage("DXRAnimTracker WARNING: not compiled in debug mode!");
+    if(!#bool(debug)) Human(GetPlayerPawn()).ClientMessage("DXRAnimTracker WARNING: not compiled in debug mode!");
 }
 
 simulated function Tick(float deltaTime)
@@ -185,14 +185,14 @@ simulated function Tick(float deltaTime)
             loc = (a_off * (1.0-f)) + (b_off * f);
         }
 
-        if(#defined(debug) && editing) {
+        if(#bool(debug) && editing) {
             Human(GetPlayerPawn()).ClientMessage(Owner.AnimSequence @ Owner.AnimFrame @ loc);
         }
         ApplyOffset(loc);
         return;
     }
 
-    if(#defined(debug) && Owner.AnimSequence != '' && editing) {
+    if(#bool(debug) && Owner.AnimSequence != '' && editing) {
         Human(GetPlayerPawn()).ClientMessage(Owner.AnimSequence @ Owner.AnimFrame);
     }
 
diff --git a/DXRando/DeusEx/Classes/TriggerEnable.uc b/DXRando/DeusEx/Classes/TriggerEnable.uc
index 7c49b2cb3..f8a343ccb 100644
--- a/DXRando/DeusEx/Classes/TriggerEnable.uc
+++ b/DXRando/DeusEx/Classes/TriggerEnable.uc
@@ -31,7 +31,7 @@ static function DXRTriggerEnable Create(Actor a, Name tag, Name Event)
     foreach t.AllActors(class'Actor', a, Event) {
         a.SetCollision(false, a.bBlockActors, a.bBlockPlayers);
     }
-    if(#defined(debug)) {
+    if(#bool(debug)) {
         t.Trigger(None, None);
     }
     return t;