From 458e1b1be2a7e76045849050f32c76b2e5c28d44 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Thu, 8 May 2014 11:29:45 +0200
Subject: [PATCH] - changed sound lookup for ZSDF dialogues so that it first
 checks the svox/ namespace before using the global one.

---
 src/p_usdf.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/p_usdf.cpp b/src/p_usdf.cpp
index 6ea32b308..2ab52e380 100644
--- a/src/p_usdf.cpp
+++ b/src/p_usdf.cpp
@@ -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;