NG+ ClearDataVaultImages() also delete lingering inventory items

Die4Ever · Oct 1, 2023 · 813323f · 813323f
1 parent 0d381e8
commit 813323f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/run-tests/action.yml b/.github/run-tests/action.yml
@@ -141,7 +141,7 @@ runs:
       shell: bash
 
     - name: Build
-      run: pyinstaller installer/installer.spec
+      run: pyinstaller --clean installer/installer.spec
       shell: bash
     - run: du -ha dist
       shell: bash

diff --git a/DXRModules/DeusEx/Classes/DXRFlagsNGPMaxRando.uc b/DXRModules/DeusEx/Classes/DXRFlagsNGPMaxRando.uc
@@ -139,15 +139,19 @@ simulated function RandomizeSettings(bool forceMenuOptions)
 function ClearDataVaultImages()
 {
     local DataVaultImage image;
+    local #var(PlayerPawn) p;
 
-    while (player().FirstImage!=None){
-        image = player().FirstImage;
-        player().FirstImage=image.nextImage;
+    p = player();
+    while (p.FirstImage!=None){
+        image = p.FirstImage;
+        p.FirstImage=image.nextImage;
         //Theoretically if we were being more discriminating with the image deletion,
         //we'd want to also fix the prevImage value, but since we're just trashing
         //everything, it's unnecessary
         image.Destroy();
     }
+
+    class'DXRActorsBase'.static.RemoveItem(p, class'#var(prefix)DataVaultImage');
 }
 
 function NewGamePlus()