From 336c8adee140a80e66867e76db1bc0def89254e3 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Fri, 10 Jul 2020 12:13:20 +0200 Subject: [PATCH] Sentences: More parsing fixes, as some dialogue broke. --- src/client/sentences.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/client/sentences.c b/src/client/sentences.c index 89d2e14d..e6ab106d 100644 --- a/src/client/sentences.c +++ b/src/client/sentences.c @@ -141,6 +141,9 @@ Sentences_Init(void) } else { g_sentences[x].m_strSamples = sprintf("%s %s", g_sentences[x].m_strSamples, argv(i)); } + + g_sentences[x].m_strSamples = + strreplace(",", " vox/comma.wav", g_sentences[x].m_strSamples); } } } @@ -153,13 +156,14 @@ Sentences_ProcessSample(string sample) { int c = tokenizebyseparator(sample, "/"); + /* this sample contains a path */ if (c > 1) { g_sentences_samplepath = argv(0); + return sample; } - sample = strreplace(",", "vox/comma.wav", sample); - - return sprintf("%s/%s", g_sentences_samplepath, sample); + /* we don't have a path, so supply the default */ + return sprintf("%s/%s", g_sentences_samplepath, argv(0)); } void