mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-11 15:22:16 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
7c180e5094
1 changed files with 5 additions and 1 deletions
|
@ -310,12 +310,16 @@ class USDFParser : public UDMFParserBase
|
|||
|
||||
case NAME_Voice:
|
||||
{
|
||||
FString soundname = (namespace_bits == St? "svox/" : "");
|
||||
const char * name = CheckString(key);
|
||||
if (name[0] != 0)
|
||||
{
|
||||
FString soundname = "svox/";
|
||||
soundname += name;
|
||||
node->SpeakerVoice = FSoundID(S_FindSound(soundname));
|
||||
if (node->SpeakerVoice == 0 && namespace_bits == Zd)
|
||||
{
|
||||
node->SpeakerVoice = FSoundID(S_FindSound(name));
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue