zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 07:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-05-08 11:30:12 +02:00
commit 7c180e5094
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_usdf.cpp
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;