1 files changed, 2 insertions, 36 deletions

diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 4c798b0ee2..a4ef6749b0 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -2237,26 +2237,9 @@ void Scumm_v6::o6_printEgo() {
 void Scumm_v6::o6_talkActor() {
 	_actorToPrintStrFor = pop();
 
-	_messagePtr = _scriptPointer;
+	_messagePtr = translateTextAndPlaySpeech(_scriptPointer);
 	_scriptPointer += resStrLen(_scriptPointer) + 1;
 
-	if ((_gameId == GID_DIG || _gameId == GID_CMI) && (_messagePtr[0] == '/')) {
-		char pointer[20];
-		int i, j;
-
-		translateText(_messagePtr, _transText);
-		for (i = 0, j = 0; (_messagePtr[i] != '/' || j == 0) && j < 19; i++) {
-			if (_messagePtr[i] != '/')
-				pointer[j++] = _messagePtr[i];
-		}
-		pointer[j] = 0;
-
-		// Play speech
-		_sound->playBundleSound(pointer, &_sound->_talkChannelHandle);
-
-		_messagePtr = _transText;
-	}
-
 	setStringVars(0);
 	actorTalk();
 }
@@ -3092,26 +3075,9 @@ void Scumm_v6::decodeParseString(int m, int n) {
 		_string[m].no_talk_anim = true;
 		break;
 	case 75:
-		_messagePtr = _scriptPointer;
+		_messagePtr = translateTextAndPlaySpeech(_scriptPointer);
 		_scriptPointer += resStrLen(_scriptPointer)+ 1;
 
-		if ((_messagePtr[0] == '/') && (_gameId == GID_DIG)) {
-			char pointer[20];
-			int i, j;
-
-			translateText(_messagePtr, _transText);
-			for (i = 0, j = 0; (_messagePtr[i] != '/' || j == 0) && j < 19; i++) {
-				if (_messagePtr[i] != '/')
-					pointer[j++] = _messagePtr[i];
-			}
-			pointer[j] = 0;
-
-			// Play speech
-			_sound->playBundleSound(pointer, &_sound->_talkChannelHandle);
-
-			_messagePtr = _transText;
-		}
-
 		switch (m) {
 		case 0:
 			actorTalk();