Fix HX PrecessorName and fix reading beyond array limits in DXREvents

Die4Ever · Jun 25, 2023 · 27739cc · 27739cc
1 parent 2bb30b5
commit 27739cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/DXRCore/DeusEx/Classes/DXRActorsBase.uc b/DXRCore/DeusEx/Classes/DXRActorsBase.uc
@@ -838,6 +838,11 @@ function Actor SpawnReplacement(Actor a, class<Actor> newclass, optional bool do
  newactor.LightHue=a.LightHue;
  newactor.LightRadius=a.LightRadius;
  }
+
+ if(#defined(hx)){
+ newactor.SetPropertyText("PrecessorName", a.GetPropertyText("PrecessorName"));
+ }
+
  return newactor;
 }
 

diff --git a/DXRModules/DeusEx/Classes/DXREvents.uc b/DXRModules/DeusEx/Classes/DXREvents.uc
@@ -1562,7 +1562,7 @@ simulated function _CreateBingoBoard(PlayerDataItem data)
  local int x, y, i;
  local string event, desc;
  local int progress, max, missions, starting_mission_mask, starting_mission;
- local int options[200], num_options, slot, free_spaces;
+ local int options[ArrayCount(bingo_options)], num_options, slot, free_spaces;
  local float f;
 
  starting_mission = class'DXRStartMap'.static.GetStartMapMission(dxr.flags.settings.starting_map);
@@ -1645,7 +1645,7 @@ simulated function _CreateBingoBoard(PlayerDataItem data)
  data.ExportBingoState();
 }
 
-simulated function int HandleMutualExclusion(MutualExclusion m, int options[200], int num_options) {
+simulated function int HandleMutualExclusion(MutualExclusion m, int options[ArrayCount(bingo_options)], int num_options) {
  local int a, b, overwrite;
 
  for(a=0; a<num_options; a++) {

diff --git a/DXRModules/DeusEx/Classes/DXRReplaceActors.uc b/DXRModules/DeusEx/Classes/DXRReplaceActors.uc
@@ -192,9 +192,7 @@ function ReplaceShipsWheel(#var(prefix)ShipsWheel a)
 
  // probably doesn't need this since it's all defaults
  //ReplaceDecoration(a, n);
-#ifdef hx
- n.PrecessorName = a.PrecessorName;
-#endif
+
  a.Destroy();
 }
 
@@ -207,9 +205,7 @@ function ReplaceWaterFountain(#var(prefix)WaterFountain a)
 
  // probably doesn't need this since it's all defaults
  //ReplaceDecoration(a, n);
-#ifdef hx
- n.PrecessorName = a.PrecessorName;
-#endif
+
  a.Destroy();
 }
 
@@ -222,9 +218,7 @@ function ReplaceWaterCooler(#var(prefix)WaterCooler a)
 
  // probably doesn't need this since it's all defaults
  //ReplaceDecoration(a, n);
-#ifdef hx
- n.PrecessorName = a.PrecessorName;
-#endif
+
  a.Destroy();
 }
 
@@ -239,9 +233,7 @@ function ReplacePoolball(#var(prefix)Poolball a)
  n.Skin = a.Skin;
  // probably doesn't need this since it's all defaults
  //ReplaceDecoration(a, n);
-#ifdef hx
- n.PrecessorName = a.PrecessorName;
-#endif
+
  a.Destroy();
 }
 
@@ -254,9 +246,6 @@ function ReplaceGenericDecoration(Actor a, class<Actor> newClass)
  if(n == None)
  return;
 
-#ifdef hx
- HXActor(n).PrecessorName = HXActor(a).PrecessorName;
-#endif
  a.Destroy();
 }
 
@@ -271,9 +260,7 @@ function ReplaceToilet(#var(prefix)Toilet a)
  n.Skin = a.Skin;
  // probably doesn't need this since it's all defaults
  //ReplaceDecoration(a, n);
-#ifdef hx
- n.PrecessorName = a.PrecessorName;
-#endif
+
  a.Destroy();
 }
 
@@ -348,9 +335,6 @@ function ReplaceTrigger(#var(prefix)Trigger a, #var(prefix)Trigger n)
  n.DamageThreshold = a.DamageThreshold;
  n.TriggerActor = a.TriggerActor;
  n.TriggerActor2 = a.TriggerActor2;
-#ifdef hx
- n.PrecessorName = a.PrecessorName;
-#endif
 }
 
 #ifdef hx
@@ -373,9 +357,6 @@ function DeusExWeapon ReplaceWeapon(DeusExWeapon a, DeusExWeapon n)
  owner.SetWeapon(n);
  }
  }
-#ifdef hx
- n.PrecessorName = a.PrecessorName;
-#endif
 }
 
 #ifdef hx