- changed sound lookup for ZSDF dialogues so that it first checks the svox/ namespace before using the global one.

This commit is contained in:
Christoph Oelckers 2014-05-08 11:29:45 +02:00
parent ea7fb936a8
commit 458e1b1be2

View file

@ -310,12 +310,16 @@ class USDFParser : public UDMFParserBase
case NAME_Voice: case NAME_Voice:
{ {
FString soundname = (namespace_bits == St? "svox/" : "");
const char * name = CheckString(key); const char * name = CheckString(key);
if (name[0] != 0) if (name[0] != 0)
{ {
FString soundname = "svox/";
soundname += name; soundname += name;
node->SpeakerVoice = FSoundID(S_FindSound(soundname)); node->SpeakerVoice = FSoundID(S_FindSound(soundname));
if (node->SpeakerVoice == 0 && namespace_bits == Zd)
{
node->SpeakerVoice = FSoundID(S_FindSound(name));
}
} }
} }
break; break;