cleanup with new #compileif preproc

Die4Ever · Apr 23, 2024 · 244069e · 244069e
1 parent d6d101f
commit 244069e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 21 deletions.
diff --git a/DXRCore/DeusEx/Classes/DXRMenuBase.uc b/DXRCore/DeusEx/Classes/DXRMenuBase.uc
@@ -1,8 +1,4 @@
-#ifdef injections
-class DXRMenuBase expands MenuUIScreenWindow;
-#else
-class DXRMenuBase expands MenuUIScreenWindow;
-#endif
+class DXRMenuBase extends MenuUIScreenWindow;
 
 var MenuUIInfoButtonWindow winNameBorder;
 

diff --git a/DXRModules/DeusEx/Classes/DXRAutosave.uc b/DXRModules/DeusEx/Classes/DXRAutosave.uc
@@ -1,3 +1,4 @@
+#compileif injections
 class DXRAutosave extends DXRActorsBase transient;
 
 var transient bool bNeedSave;

diff --git a/DXRModules/DeusEx/Classes/DXRFashion.uc b/DXRModules/DeusEx/Classes/DXRFashion.uc
@@ -1,3 +1,4 @@
+#dontcompileif vmd
 class DXRFashion extends DXRBase transient;
 
 var class<ScriptedPawn> influencers[100];

diff --git a/DXRando/DeusEx/Classes/DXRRevMissionEndgame.uc b/DXRando/DeusEx/Classes/DXRRevMissionEndgame.uc
@@ -1,10 +1,6 @@
-#ifndef revision
-class DXRRevMissionEndgame extends Actor;
-#else
+#compileif revision
 class DXRRevMissionEndgame extends RevisionMissionEndgame;
 
-
-
 function Timer()
 {
     Super.Timer();
@@ -62,5 +58,3 @@ function PrintEndgameQuote(int num)
         }
     }
 }
-
-#endif
diff --git a/DXRando/DeusEx/Classes/DXRRevMissionIntro.uc b/DXRando/DeusEx/Classes/DXRRevMissionIntro.uc
@@ -1,6 +1,4 @@
-#ifndef revision
-class DXRRevMissionIntro extends Actor;
-#else
+#compileif revision
 class DXRRevMissionIntro extends RevisionMissionIntro;
 
 function Timer()
@@ -19,5 +17,3 @@ function Timer()
     }
     Super.Timer();
 }
-
-#endif
diff --git a/compiler_settings.default.json b/compiler_settings.default.json
@@ -30,7 +30,7 @@
         "verbose": false,
         "copy_if_changed": "DXRVersion.uc",
         "run_tests": false,
-        "blacklist": [ "DXRVanilla", "DXRBalance", "DXRFixes", "DXRAutosave.uc" ]
+        "blacklist": [ "DXRVanilla", "DXRBalance", "DXRFixes" ]
     },
     "gmdx": {
         "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex GMDX Backup/",
@@ -45,7 +45,7 @@
         "verbose": false,
         "copy_if_changed": "DXRVersion.uc",
         "run_tests": true,
-        "blacklist": [ "DXRVanilla", "DXRBalance", "DXRFixes", "DXRAutosave.uc" ]
+        "blacklist": [ "DXRVanilla", "DXRBalance", "DXRFixes" ]
     },
     "revision": {
         "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex Revision Backup/",
@@ -60,7 +60,7 @@
         "verbose": false,
         "copy_if_changed": "DXRVersion.uc",
         "run_tests": false,
-        "blacklist": [ "DXRVanilla", "DXRBalance", "DXRFixes", "DXRAutosave.uc" ]
+        "blacklist": [ "DXRVanilla", "DXRBalance", "DXRFixes" ]
     },
     "vmd": {
         "source_path": "C:/Program Files (x86)/Steam/steamapps/common/Deus Ex VMD Backup/",
@@ -75,6 +75,6 @@
         "verbose": false,
         "copy_if_changed": "DXRVersion.uc",
         "run_tests": true,
-        "blacklist": [ "DXRVanilla", "DXRBalance", "DXRFixes", "DXRAutosave.uc", "DXRFashion.uc" ]
+        "blacklist": [ "DXRVanilla", "DXRBalance", "DXRFixes" ]
     }
 }