stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-22 20:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some SOC parsing bugs, use MT_ constant as default name if no object name is provided

Browse source
This commit is contained in:
spherallic 2024-02-07 18:28:12 +01:00
parent d5d1593a6a
commit 0ea7cdc429
2 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/SRB2/LuaMobjStructure.cs
View file

@ -26,7 +26,9 @@ namespace CodeImp.DoomBuilder.ZDoom
{
parser.ReportError("Lua object structure has no object name or map thing number");
return;
}
}
else
props["$title"] = new List<string> { objname };
if (editnum > 0)
doomednum = editnum;
@ -64,7 +66,7 @@ namespace CodeImp.DoomBuilder.ZDoom
token = "$title";
goto default;
default:
props[token] = new List<string> { (parser.SkipWhitespace(false) ? parser.ReadLine() : "") };
props[token] = new List<string> { parser.SkipWhitespace(false) ? parser.ReadLine() : "" };
break;
}
}

54
Source/Core/SRB2/SOCMobjStructure.cs
View file

@ -11,34 +11,39 @@ using System.Text;
namespace CodeImp.DoomBuilder.ZDoom
{
public sealed class SOCMobjStructure : ActorStructure
public sealed class SOCMobjStructure : ActorStructure
{
#region ================== SOC Mobj Structure parsing
internal SOCMobjStructure(ZDTextParser zdparser, string objname)
{
#region ================== SOC Mobj Structure parsing
internal SOCMobjStructure(ZDTextParser zdparser, string objname)
{
classname = string.Empty;
SOCParser parser = (SOCParser)zdparser;
General.WriteLogLine(objname);
SOCParser parser = (SOCParser)zdparser;
//General.WriteLogLine(objname);
if (string.IsNullOrEmpty(objname))
{
parser.ReportError("SOC object structure has no object name or map thing number");
return;
}
{
parser.ReportError("SOC object structure has no object name or map thing number");
return;
}
else
props["$title"] = new List<string> { objname };
// Skip initial newline & comments
parser.ReadLine();
// Now parse the contents of actor structure
while (parser.SkipWhitespace(false, true))
{
string token = parser.ReadToken();
token = token.ToLowerInvariant();
// SOC definitions are terminated by an empty line. Blegh.
if (token == "\n")
{
parser.SkipWhitespace(false, true);
token = parser.ReadToken();
//General.WriteLogLine("object definition done");
break;
}
// Property begins with $? Then the whole line is a single value
@ -58,7 +63,7 @@ namespace CodeImp.DoomBuilder.ZDoom
token = "$title";
goto default;
default:
props[token] = new List<string> { (parser.SkipWhitespace(false, true) ? parser.ReadLine() : "") };
props[token] = new List<string> { parser.SkipWhitespace(false, true) ? parser.ReadLine() : "" };
break;
}
}
@ -68,15 +73,8 @@ namespace CodeImp.DoomBuilder.ZDoom
parser.SkipWhitespace(false, true);
token = parser.ReadToken();
General.WriteLogLine(tokenname);
General.WriteLogLine(token);
// SOC definitions are terminated by an empty line. Blegh.
if (tokenname == "\n")
{
General.WriteLogLine("object definition done");
break;
}
//General.WriteLogLine("token name = " + tokenname);
//General.WriteLogLine("token = " + token);
if (token != "=")
{
@ -85,7 +83,13 @@ namespace CodeImp.DoomBuilder.ZDoom
}
parser.SkipWhitespace(true, true);
token = parser.ReadToken();
token = parser.ReadLine();
// Strip comments
int comment = token.IndexOf('#');
if (comment >= 0)
token = token.Substring(0, comment);
tokenname = tokenname.ToLowerInvariant();
List<string> values = new List<string>() { token.TrimEnd(new char[] { ',' }) };