From 3552024aa97d07f634aece9b43b36ffc3ddbc068 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 18 Sep 2004 20:50:15 +0000
Subject: Added ScummEngine::printString() convenience method; changed
 enqueueText to call addMessageToStack

svn-id: r15170
---
 scumm/script_v5.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'scumm/script_v5.cpp')

diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 96625e2e09..017f9baaee 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -2608,7 +2608,6 @@ int ScummEngine_v5::getWordVararg(int *ptr) {
 
 void ScummEngine_v5::decodeParseString() {
 	int textSlot;
-	const byte *msg;
 
 	switch (_actorToPrintStrFor) {
 	case 252:
@@ -2691,23 +2690,9 @@ void ScummEngine_v5::decodeParseString() {
 			}
 			break;
 		case 15:	// SO_TEXTSTRING
-			msg = _scriptPointer;
+			printString(textSlot, _scriptPointer);
 			_scriptPointer += resStrLen(_scriptPointer) + 1;
 
-			switch (textSlot) {
-			case 0:
-				actorTalk(msg);
-				break;
-			case 1:
-				drawString(1, msg);
-				break;
-			case 2:
-				unkMessage1(msg);
-				break;
-			case 3:
-				unkMessage2(msg);
-				break;
-			}
 
  			// In SCUMM V1-V3, there were no 'default' values for the text slot
  			// values. Hence to achieve correct behaviour, we have to keep the
-- 
cgit v1.2.3