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, GLDEFS parser: in some cases the parser was unable to detect the end of "Glow" block, which resulted in skipping the rest of the file.

Browse source
This commit is contained in:
MaxED 2015-12-27 00:13:31 +00:00
parent dc3d4064a1
commit f86bc370d9
3 changed files with 593 additions and 568 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1142
Source/Core/GZBuilder/GZDoom/GldefsParser.cs
View file

File diff suppressed because it is too large Load diff

10
Source/Core/GZBuilder/GZDoom/MapinfoParser.cs
View file

@ -137,7 +137,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
//should be sky texture name
token = StripTokenQuotes(ReadToken());
bool gotComma = (token.IndexOf(",") != -1);
bool gotComma = (token.IndexOf(",", StringComparison.Ordinal) != -1);
if(gotComma) token = token.Replace(",", "");
string skyTexture = StripTokenQuotes(token).ToLowerInvariant();
@ -359,7 +359,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
//INFO: ZDoom MAPINFO include paths can't be relative ("../mapstuff.txt")
//or absolute ("d:/project/mapstuff.txt")
//or have backward slases ("info\mapstuff.txt")
//or have backward slashes ("info\mapstuff.txt")
//include paths are relative to the first parsed entry, not the current one
//also include paths may or may not be quoted
if(!string.IsNullOrEmpty(includelump))
@ -379,10 +379,10 @@ namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
return false;
}
// Backward slases are not supported
if(includelump.Contains(Path.DirectorySeparatorChar.ToString()))
// Backward slashes are not supported
if(includelump.Contains(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture)))
{
ReportError("Only forward slases are supported by ZDoom");
ReportError("Only forward slashes are supported by ZDoom");
return false;
}

9
Source/Core/ZDoom/DecorateParser.cs
View file

@ -18,6 +18,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
#endregion
@ -154,7 +155,7 @@ namespace CodeImp.DoomBuilder.ZDoom
{
//INFO: ZDoom DECORATE include paths can't be relative ("../actor.txt")
//or absolute ("d:/project/actor.txt")
//or have backward slases ("info\actor.txt")
//or have backward slashes ("info\actor.txt")
//include paths are relative to the first parsed entry, not the current one
//also include paths may or may not be quoted
SkipWhitespace(true);
@ -182,10 +183,10 @@ namespace CodeImp.DoomBuilder.ZDoom
return false;
}
//mxd. Backward slases are not supported
if(filename.Contains(Path.DirectorySeparatorChar.ToString()))
//mxd. Backward slashes are not supported
if(filename.Contains(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture)))
{
ReportError("Only forward slases are supported by ZDoom");
ReportError("Only forward slashes are supported by ZDoom");
return false;
}