mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-22 12:11:25 +00:00
- allow SNDINFO to declare sound mappings by using 'sounda = soundfle'.
This works similar to MAPINFO: The first definition in a file declares the format, all later ones must be the same. This change in syntax increases robustness significantly because it avoids the problems with the original syntax not being able to detect badly formatted names.
This commit is contained in:
parent
f7f67114ed
commit
419e593a4c
2 changed files with 11 additions and 1 deletions
|
@ -799,6 +799,7 @@ static void S_AddSNDINFO (int lump)
|
|||
auto &S_sfx = soundEngine->GetSounds();
|
||||
bool skipToEndIf;
|
||||
TArray<uint32_t> list;
|
||||
int wantassigns = -1;
|
||||
|
||||
FScanner sc(lump);
|
||||
skipToEndIf = false;
|
||||
|
@ -1247,6 +1248,15 @@ static void S_AddSNDINFO (int lump)
|
|||
else
|
||||
{ // Got a logical sound mapping
|
||||
FString name (sc.String);
|
||||
if (wantassigns == -1)
|
||||
{
|
||||
wantassigns = sc.CheckString("=");
|
||||
}
|
||||
else if (wantassigns)
|
||||
{
|
||||
sc.MustGetStringName("=");
|
||||
}
|
||||
|
||||
sc.MustGetString ();
|
||||
S_AddSound (name, sc.String, &sc);
|
||||
}
|
||||
|
|
|
@ -2822,7 +2822,7 @@ OptionValue "os_isanyof_values"
|
|||
OptionMenu "vkoptions"
|
||||
{
|
||||
Title "$VK_TITLE"
|
||||
StaticText "$VK_WARNING"
|
||||
//StaticText "$VK_WARNING"
|
||||
StaticText "$VK_RESTART"
|
||||
StaticText ""
|
||||
TextField "$VKMNU_DEVICE", vk_device
|
||||
|
|
Loading…
Reference in a new issue