stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-19 06:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

SNDINFO parser: added support for GZDoom's new sound assignment format. Fixes #1017

Browse source
This commit is contained in:
biwa 2024-02-03 15:10:56 +01:00
parent 29643d98b4
commit f9dd98695b
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/Core/ZDoom/SndInfoParser.cs
View file

@ -17,6 +17,14 @@ namespace CodeImp.DoomBuilder.ZDoom
private Dictionary<int, AmbientSoundInfo> ambientsounds;
private Dictionary<string, SoundInfo> sounds;
private SoundInfo globalprops;
// There are two formats supported, with the old format being
// logicalname lumpname
// and the new format being
// logicalname = lumpname
// Only one format may be used
private enum SndInfoFormat { None, Old, New }
private SndInfoFormat format = SndInfoFormat.None;
#endregion
@ -390,6 +398,17 @@ namespace CodeImp.DoomBuilder.ZDoom
logicalname = StripTokenQuotes(logicalname);
if(string.IsNullOrEmpty(logicalname)) return false;
// Check sound assignment format and report an error if both the old and new format is used
if ((format == SndInfoFormat.New && !NextTokenIs("=", false)) || (format == SndInfoFormat.Old && NextTokenIs("=", false)))
{
ReportError("Mixing old and new sound assignment format is not permitted");
return false;
}
else if(format == SndInfoFormat.None)
{
format = NextTokenIs("=", false) ? SndInfoFormat.New : SndInfoFormat.Old;
}
// Read lumpname
if(!SkipWhitespace(true)) return false;
string lumpname = StripTokenQuotes(ReadToken());