From 9a4cc8536684e1d1fe0097a1408c6e9bf57b8275 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sun, 14 Jun 2020 00:55:01 +0200
Subject: [PATCH] speaker: Initial implementation; Misc improvements to the
 sentences processing.

---
 src/client/sentences.c               |  1 -
 src/gs-entbase/client/baseentity.cpp | 33 ++++++++++++++++++----------
 src/gs-entbase/server.src            |  1 +
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/client/sentences.c b/src/client/sentences.c
index 178c8a92..160d10e6 100644
--- a/src/client/sentences.c
+++ b/src/client/sentences.c
@@ -121,6 +121,5 @@ Sentences_GetSamples(string msg)
 			return g_sentences[i].m_strSamples;
 		}
 	}
-
 	return "";
 }
diff --git a/src/gs-entbase/client/baseentity.cpp b/src/gs-entbase/client/baseentity.cpp
index fb925169..f2235bf9 100644
--- a/src/gs-entbase/client/baseentity.cpp
+++ b/src/gs-entbase/client/baseentity.cpp
@@ -196,26 +196,29 @@ CBaseEntity::ProcessWordQue(void)
 		return;
 	}
 
-	/* hack to get vox working. */
-	string sndpath;
-	int c = tokenizebyseparator(m_pSentenceQue[m_iSentencePos].m_strSnd, "/");
-	if (c > 1) {
-		sndpath = argv(0);
-	} else {
-		sndpath =  "vox";
-	}
-
-	sound(this, CHAN_VOICE, sprintf("%s/%s", sndpath, argv(1)), 1.0, ATTN_NORM, 100, SOUNDFLAG_FOLLOW);
+	sound(this, CHAN_VOICE, m_pSentenceQue[m_iSentencePos].m_strSnd, 1.0, ATTN_NORM, 100, SOUNDFLAG_FOLLOW);
 	dprint(sprintf("^2CBaseEntity::^3ProcessWordQue^7: Speaking %s\n", m_pSentenceQue[m_iSentencePos].m_strSnd));
 	m_iSentencePos++;
 
-	if (m_iSentenceCount == m_iSentenceCount) {
+	if (m_iSentencePos == m_iSentenceCount) {
 		memfree(m_pSentenceQue);
 		m_iSentenceCount = 0;
 		m_iSentencePos = 0;
 		m_pSentenceQue = 0;
 	} else {
-		m_flSentenceTime = time + m_pSentenceQue[m_iSentenceCount - 1].m_flLength;
+		m_flSentenceTime = time + m_pSentenceQue[m_iSentencePos - 1].m_flLength;
+	}
+}
+
+string
+CBaseEntity_ProcessSample(string sample)
+{
+	int c = tokenizebyseparator(sample, "/");
+
+	if (c > 1) {
+		return sample;
+	} else {
+		return sprintf("vox/%s", sample);
 	}
 }
 
@@ -238,8 +241,14 @@ CBaseEntity::Sentence(string msg)
 	m_iSentenceCount = tokenize(Sentences_GetSamples(msg));
 	m_pSentenceQue = memalloc(sizeof(sound_t) * m_iSentenceCount);
 
+	/* first we have to get the info out of the token */
 	for (int i = 0; i < m_iSentenceCount; i++) {
 		m_pSentenceQue[i].m_strSnd = sprintf("%s.wav", argv(i));
+	}
+
+	/* process more info, we'll need to override argv() here */
+	for (int i = 0; i < m_iSentenceCount; i++) {
+		m_pSentenceQue[i].m_strSnd = CBaseEntity_ProcessSample(m_pSentenceQue[i].m_strSnd);
 		m_pSentenceQue[i].m_flLength = soundlength(m_pSentenceQue[i].m_strSnd);
 		m_pSentenceQue[i].m_flPitch = 100;
 	}
diff --git a/src/gs-entbase/server.src b/src/gs-entbase/server.src
index ff5fab3c..3e460384 100644
--- a/src/gs-entbase/server.src
+++ b/src/gs-entbase/server.src
@@ -68,6 +68,7 @@ server/env_beverage.cpp
 server/env_global.cpp
 server/env_laser.cpp
 server/item_food.cpp
+server/speaker.cpp
 server/multi_manager.cpp
 server/monster_furniture.cpp
 server/monster_generic.cpp