Fix TMUnlimiter 2 block parse issue with v2+

BigBang1112 · Jul 3, 2024 · a9eea4d · a9eea4d
1 parent ca7b4c6
commit a9eea4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git a/Src/GBX.NET/Engines/Game/CGameCtnBlock.chunkl b/Src/GBX.NET/Engines/Game/CGameCtnBlock.chunkl
@@ -14,8 +14,9 @@ archive
   short Flags
  v1+
   int Flags
- if Flags == -1
-  return
+ v2+
+  if Flags == -1
+   return
  if (Flags & (1 << 15)) != 0
   id Author
   CGameCtnBlockSkin Skin

diff --git a/Src/GBX.NET/Engines/Game/CGameCtnChallenge.cs b/Src/GBX.NET/Engines/Game/CGameCtnChallenge.cs
@@ -738,8 +738,6 @@ public partial class Chunk0304301F : IVersionable
         public bool U01;
         public ulong? U02;
 
-        public bool IsUnlimiter2 { get; set; }
-
         public override void Read(CGameCtnChallenge n, GbxReader r)
         {
             n.mapInfo = r.ReadIdent();
@@ -752,36 +750,17 @@ public override void Read(CGameCtnChallenge n, GbxReader r)
             var nbBlocks = r.ReadInt32();
             n.blocks = new List<CGameCtnBlock>(nbBlocks);
 
-            var isUnlimiter = default(bool?);
-
             for (var i = 0; i < nbBlocks; i++)
             {
                 var block = r.ReadReadable<CGameCtnBlock>(Version);
                 n.blocks.Add(block);
 
-                if (block.Flags != -1)
-                {
-                    continue;
-                }
-
-                isUnlimiter ??= block.Name.StartsWith("TMUnlimiter 2");
-
-                if (isUnlimiter.Value)
-                {
-                    IsUnlimiter2 = isUnlimiter.Value;
-                }
-                else
+                if (block.Flags == -1)
                 {
                     i--;
                 }
             }
 
-            if (IsUnlimiter2)
-            {
-                U02 = r.ReadUInt64();
-                return;
-            }
-
             while ((r.PeekUInt32() & 0xC0000000) > 0)
             {
                 n.blocks.Add(r.ReadReadable<CGameCtnBlock>(Version));
@@ -808,11 +787,6 @@ public override void Write(CGameCtnChallenge n, GbxWriter w)
             {
                 w.WriteWritable(block, Version);
             }
-
-            if (IsUnlimiter2)
-            {
-                w.Write(U02.GetValueOrDefault());
-            }
         }
     }