move RemoveRandomWeapon into DXRFlagsNGPMaxRando

Die4Ever · Sep 10, 2023 · 9e6c428 · 9e6c428
1 parent 48cd02f
commit 9e6c428
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/DXRModules/DeusEx/Classes/DXRFlagsNGPMaxRando.uc b/DXRModules/DeusEx/Classes/DXRFlagsNGPMaxRando.uc
@@ -154,7 +154,6 @@ function NewGamePlus()
     local #var(PlayerPawn) p;
     local DataStorage ds;
     local DXRSkills skills;
-    local DXRWeapons weapons;
     local DXRAugmentations augs;
     local int i, bingo_win,bingo_freespaces;
     local float exp;
@@ -244,9 +243,7 @@ function NewGamePlus()
         augs.RemoveRandomAug(p);
 
     // TODO: do this in the intro instead of in the credits?
-    weapons = DXRWeapons(dxr.FindModule(class'DXRWeapons'));
-    if( weapons != None )
-        weapons.RemoveRandomWeapon(p);
+    RemoveRandomWeapon(p);
 
     //Should you actually get fresh augs and credits on a NG+ non-vanilla start map?
     //Technically it should make up for levels you skipped past, so maybe?
@@ -263,3 +260,26 @@ function NewGamePlus()
     class'PlayerDataItem'.static.ResetData(p);
     Level.Game.SendPlayer(p, "00_intro");
 }
+
+simulated function RemoveRandomWeapon(#var(PlayerPawn) p)
+{
+    local Inventory i, next;
+    local Weapon weaps[64];
+    local int numWeaps, slot;
+
+    for( i = p.Inventory; i != None; i = next ) {
+        next = i.Inventory;
+        if( Weapon(i) == None ) continue;
+        weaps[numWeaps++] = Weapon(i);
+    }
+
+    // don't take the player's only weapon
+    if( numWeaps <= 1 ) return;
+
+    SetSeed( "RemoveRandomWeapon " $ numWeaps );
+
+    slot = rng(numWeaps);
+    info("RemoveRandomWeapon("$p$") Removing weapon "$weaps[slot]$", numWeaps was "$numWeaps);
+    p.DeleteInventory(weaps[slot]);
+    weaps[slot].Destroy();
+}
diff --git a/DXRModules/DeusEx/Classes/DXRWeapons.uc b/DXRModules/DeusEx/Classes/DXRWeapons.uc
@@ -159,25 +159,3 @@ simulated function bool RandoProjectile(DeusExWeapon w, out class<Projectile> p,
 
     return true;
 }
-
-simulated function RemoveRandomWeapon(#var(PlayerPawn) p)
-{
-    local Inventory i;
-    local Weapon weaps[64];
-    local int numWeaps, slot;
-
-    for( i = p.Inventory; i != None; i = i.Inventory ) {
-        if( Weapon(i) == None ) continue;
-        weaps[numWeaps++] = Weapon(i);
-    }
-
-    // don't take the player's only weapon
-    if( numWeaps <= 1 ) return;
-
-    SetSeed( "RemoveRandomWeapon " $ numWeaps );
-
-    slot = rng(numWeaps);
-    info("RemoveRandomWeapon("$p$") Removing weapon "$weaps[slot]$", numWeaps was "$numWeaps);
-    p.DeleteInventory(weaps[slot]);
-    weaps[slot].Destroy();
-}