Don't automatically load the 'origin' keyvalue for non-point entities

LogicAndTrick · Jul 29, 2023 · c11028f · c11028f
1 parent 8def831
commit c11028f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/Sledge.Formats.Map/Formats/JackhamerJmfFormat.cs b/Sledge.Formats.Map/Formats/JackhamerJmfFormat.cs
@@ -243,7 +243,6 @@ private List<JmfEntity> ReadEntities(MapFile map, BinaryReader br)
                 };
 
                 var origin = br.ReadVector3();
-                ent.Entity.Properties["origin"] = $"{origin.X} {origin.Y} {origin.Z}";
 
                 ent.Flags = br.ReadInt32();
                 ent.GroupID = br.ReadInt32();
@@ -292,6 +291,9 @@ private List<JmfEntity> ReadEntities(MapFile map, BinaryReader br)
                     ent.Solids.Add(ReadSolid(map, br));
                 }
 
+                // Don't add the origin key for brush entities, we use origin brushes for that
+                if (!ent.Solids.Any()) ent.Entity.Properties["origin"] = $"{origin.X} {origin.Y} {origin.Z}";
+
                 entities.Add(ent);
             }
 

diff --git a/Sledge.Formats.Map/Formats/QuakeMapFormat.cs b/Sledge.Formats.Map/Formats/QuakeMapFormat.cs
@@ -455,6 +455,14 @@ private static void WriteEntityWithSolids(StreamWriter sw, Entity e, IEnumerable
 
             WriteProperty(sw, "classname", e.ClassName);
 
+            if (e.ClassName == "worldspawn")
+            {
+                if (styleHint != "idTech2" && styleHint != "idTech3" && styleHint != "idTech4")
+                {
+                    WriteProperty(sw, "mapversion", "220");
+                }
+            }
+
             if (e.SpawnFlags != 0)
             {
                 WriteProperty(sw, "spawnflags", e.SpawnFlags.ToString(CultureInfo.InvariantCulture));

diff --git a/Sledge.Formats.Map/Formats/WorldcraftRmfFormat.cs b/Sledge.Formats.Map/Formats/WorldcraftRmfFormat.cs
@@ -191,8 +191,11 @@ private static Entity ReadEntity(MapFile map, RmfVersion version, BinaryReader b
             ReadMapBase(map, version, ent, br);
             ReadEntityData(version, ent, br);
             br.ReadBytes(2); // Unused
+
+            // Don't add the origin key for brush entities, we use origin brushes for that
             var origin = br.ReadVector3();
-            ent.Properties["origin"] = $"{origin.X.ToString("0.000", CultureInfo.InvariantCulture)} {origin.Y.ToString("0.000", CultureInfo.InvariantCulture)} {origin.Z.ToString("0.000", CultureInfo.InvariantCulture)}";
+            if (!ent.Children.Any()) ent.Properties["origin"] = $"{origin.X.ToString("0.000", CultureInfo.InvariantCulture)} {origin.Y.ToString("0.000", CultureInfo.InvariantCulture)} {origin.Z.ToString("0.000", CultureInfo.InvariantCulture)}";
+
             br.ReadBytes(4); // Unused
             return ent;
         }
@@ -471,7 +474,7 @@ private static void WriteEntityData(Entity data, BinaryWriter bw)
             bw.Write(new byte[4]); // Unused
             bw.Write(data.SpawnFlags);
 
-            var props = data.SortedProperties.Where(x => !String.IsNullOrWhiteSpace(x.Key)).ToList();
+            var props = data.SortedProperties.Where(x => !String.IsNullOrWhiteSpace(x.Key) && x.Key != "origin").ToList();
             bw.Write(props.Count);
             foreach (var p in props)
             {

diff --git a/Sledge.Formats.Map/Sledge.Formats.Map.csproj b/Sledge.Formats.Map/Sledge.Formats.Map.csproj
@@ -11,8 +11,8 @@
     <RepositoryUrl>https://github.com/LogicAndTrick/sledge-formats</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>half-life quake valve hammer worldcraft jackhammer jack rmf vmf map jmf</PackageTags>
-    <PackageReleaseNotes>Don't allow backslash escapes in map file strings</PackageReleaseNotes>
-    <Version>1.1.2</Version>
+    <PackageReleaseNotes>Don't automatically load the 'origin' keyvalue for non-point entities</PackageReleaseNotes>
+    <Version>1.1.3</Version>
 	<DebugType>full</DebugType>
 	<DebugSymbols>true</DebugSymbols>
   </PropertyGroup>