1 files changed, 21 insertions, 23 deletions

diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 9b4c1b7622..7385d4d861 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -24,34 +24,33 @@
 #include "common/savefile.h"
 
 #include "sludge/allfiles.h"
-#include "sludge/sludger.h"
-#include "sludge/builtin.h"
-#include "sludge/newfatal.h"
-#include "sludge/cursors.h"
-#include "sludge/statusba.h"
-#include "sludge/loadsave.h"
 #include "sludge/backdrop.h"
 #include "sludge/bg_effects.h"
-#include "sludge/sprites.h"
-#include "sludge/fonttext.h"
-#include "sludge/sprbanks.h"
-#include "sludge/people.h"
-#include "sludge/sound.h"
-#include "sludge/objtypes.h"
+#include "sludge/builtin.h"
+#include "sludge/cursors.h"
+#include "sludge/event.h"
 #include "sludge/floor.h"
-#include "sludge/zbuffer.h"
-#include "sludge/talk.h"
-#include "sludge/region.h"
+#include "sludge/fonttext.h"
+#include "sludge/freeze.h"
+#include "sludge/graphics.h"
 #include "sludge/language.h"
+#include "sludge/loadsave.h"
 #include "sludge/moreio.h"
 #include "sludge/movie.h"
+#include "sludge/newfatal.h"
+#include "sludge/objtypes.h"
+#include "sludge/people.h"
+#include "sludge/region.h"
 #include "sludge/savedata.h"
-#include "sludge/freeze.h"
-#include "sludge/language.h"
+#include "sludge/sludger.h"
+#include "sludge/sound.h"
+#include "sludge/speech.h"
+#include "sludge/sprbanks.h"
+#include "sludge/sprites.h"
+#include "sludge/statusba.h"
 #include "sludge/sludge.h"
 #include "sludge/utf8.h"
-#include "sludge/graphics.h"
-#include "sludge/event.h"
+#include "sludge/zbuffer.h"
 
 namespace Sludge {
 
@@ -71,7 +70,6 @@ extern int numBIFNames, numUserFunc;
 extern Common::String *allUserFunc;
 extern Common::String *allBIFNames;
 
-extern float speechSpeed;
 extern byte brightnessLevel;
 extern byte fadeMode;
 extern uint16 saveEncoding;
@@ -153,7 +151,7 @@ static BuiltReturn sayCore(int numParams, LoadedFunction *fun, bool sayIt) {
 			if (!getValueType(objT, SVT_OBJTYPE, fun->stack->thisVar))
 				return BR_ERROR;
 			trimStack(fun->stack);
-			p = wrapSpeech(newText, objT, fileNum, sayIt);
+			p = g_sludge->_speechMan->wrapSpeech(newText, objT, fileNum, sayIt);
 			fun->timeLeft = p;
 			//debugOut ("BUILTIN: sayCore: %s (%i)\n", newText, p);
 			fun->isSpeech = true;
@@ -1298,7 +1296,7 @@ builtIn(setSpeechMode) {
 
 builtIn(somethingSpeaking) {
 	UNUSEDALL
-	int i = isThereAnySpeechGoingOn();
+	int i = g_sludge->_speechMan->isThereAnySpeechGoingOn();
 	if (i == -1) {
 		setVariable(fun->reg, SVT_INT, 0);
 	} else {
@@ -1958,7 +1956,7 @@ builtIn(setSpeechSpeed) {
 	if (!getValueType(number, SVT_INT, fun->stack->thisVar))
 		return BR_ERROR;
 	trimStack(fun->stack);
-	speechSpeed = number * 0.01;
+	g_sludge->_speechMan->setSpeechSpeed(number * 0.01);
 	setVariable(fun->reg, SVT_INT, 1);
 	return BR_CONTINUE;
 }