Fix package loading for Borderlands UE-Explorer/UE-Explorer#55

EliotVU · Apr 27, 2024 · fc4eb1e · fc4eb1e
1 parent 5b5030e
commit fc4eb1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/Eliot.UELib.csproj b/src/Eliot.UELib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <DefineConstants>DECOMPILE;BINARYMETADATA;Forms;UE1;UE2;UE3;UE4;VENGEANCE;SWAT4;UNREAL2;INFINITYBLADE;BORDERLANDS2;GOW2;APB;SPECIALFORCE2;XIII;SINGULARITY;THIEF_DS;DEUSEX_IW;BORDERLANDS;MIRRORSEDGE;BIOSHOCK;HAWKEN;UT;DISHONORED;REMEMBERME;ALPHAPROTOCOL;VANGUARD;TERA;MKKE;TRANSFORMERS;XCOM2;DD2;DCUO;AA2;SPELLBORN;BATMAN;MOH;ROCKETLEAGUE;DNF;LSGAME;UNDYING;HP;DEVASTATION;SPLINTERCELL;AHIT</DefineConstants>
+    <DefineConstants>DECOMPILE;BINARYMETADATA;Forms;UE1;UE2;UE3;UE4;VENGEANCE;SWAT4;UNREAL2;INFINITYBLADE;BORDERLANDS2;GOW2;APB;SPECIALFORCE2;XIII;SINGULARITY;THIEF_DS;DEUSEX_IW;BORDERLANDS;MIRRORSEDGE;BIOSHOCK;HAWKEN;UT;DISHONORED;REMEMBERME;ALPHAPROTOCOL;VANGUARD;TERA;MKKE;TRANSFORMERS;XCOM2;DD2;DCUO;AA2;SPELLBORN;BATMAN;MOH;ROCKETLEAGUE;DNF;LSGAME;UNDYING;HP;DEVASTATION;BATTLEBORN;SPLINTERCELL;AHIT</DefineConstants>
     <TargetFramework>net48</TargetFramework>
     <OutputType>Library</OutputType>
     <RootNamespace>UELib</RootNamespace>

diff --git a/src/UnrealPackage.cs b/src/UnrealPackage.cs
@@ -1111,9 +1111,6 @@ public void Deserialize(IUnrealStream stream)
                     // An FString converted to an FArray? Concatenating appUserName, appComputerName, appBaseDir, and appTimestamp.
                     stream.ReadArray(out UArray<byte> iStack_fc);
                 }
-#endif
-#if BORDERLANDS
-                if (stream.Package.Build == GameBuild.BuildName.Borderlands) stream.Skip(4);
 #endif
                 if (stream.UE4Version >= 384)
                 {
@@ -1297,10 +1294,10 @@ public void Deserialize(IUnrealStream stream)
                     }
 #endif
                 }
-#if BORDERLANDS
+#if BATTLEBORN
                 if (stream.Package.Build == GameBuild.BuildName.Battleborn)
                 {
-                    // FIXME: Package format is being deserialzied incorrectly and fails here.
+                    // FIXME: Package format is being deserialized incorrectly and fails here.
                     stream.ReadUInt32();
                     return;
                 }