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

Fixed: FAIL medal sprite in zandronum.pk3 was not parsed correctly

Browse source
This commit is contained in:
ZZYZX 2017-03-08 23:34:21 +02:00
parent 4611aa1bc8
commit 87a2a14d7c
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Properties/AssemblyInfo.cs
View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.3.0.2933")] [assembly: AssemblyVersion("2.3.0.2934")]
[assembly: NeutralResourcesLanguageAttribute("en")] [assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("717e48e")] [assembly: AssemblyHash("4611aa1")]

16
Source/Core/ZDoom/DecorateStateStructure.cs
View file

@ -30,9 +30,23 @@ namespace CodeImp.DoomBuilder.ZDoom
if ((token == "loop") || (token == "stop") || (token == "wait") || (token == "fail")) if ((token == "loop") || (token == "stop") || (token == "wait") || (token == "fail"))
{ {
// Ignore flow control // Ignore flow control
// [ZZ] sometimes "fail" is a sprite name... (Skulltag, Zandronum)
// probably the same can happen to other single-word flow control keywords.
// check if next token is newline.
long cpos = parser.DataStream.Position;
parser.SkipWhitespace(false);
string newline = parser.ReadToken();
parser.DataStream.Position = cpos;
if (newline == "\n") // this is actually a loop/stop/wait/fail directive and not a sprite name or something
{
lasttoken = token;
continue;
}
} }
// Goto? // Goto?
else if (token == "goto") if (token == "goto")
{ {
gotostate = new DecorateStateGoto(actor, parser); gotostate = new DecorateStateGoto(actor, parser);
if (parser.HasError) return; if (parser.HasError) return;

2
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.3.0.2933")] [assembly: AssemblyVersion("2.3.0.2934")]
[assembly: NeutralResourcesLanguageAttribute("en")] [assembly: NeutralResourcesLanguageAttribute("en")]