[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.145,1.146

Max Horn fingolfin at users.sourceforge.net
Sat May 31 18:01:17 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3363

Modified Files:
	script_v6.cpp 
Log Message:
cleanup

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- script_v6.cpp	31 May 2003 21:42:33 -0000	1.145
+++ script_v6.cpp	1 Jun 2003 00:45:08 -0000	1.146
@@ -2219,15 +2219,15 @@
 
 void Scumm_v6::o6_talkActor() {
 	_actorToPrintStrFor = pop();
+
 	_messagePtr = _scriptPointer;
+	_scriptPointer += resStrLen(_scriptPointer) + 1;
 
 	if (((_gameId == GID_DIG) || (_features & GF_AFTER_V8)) && (_messagePtr[0] == '/')) {
 		char pointer[20];
 		int i, j;
 
-		_scriptPointer += resStrLen(_scriptPointer) + 1;
 		translateText(_messagePtr, _transText);
-
 		for (i = 0, j = 0; (_messagePtr[i] != '/' || j == 0) && j < 19; i++) {
 			if (_messagePtr[i] != '/')
 				pointer[j++] = _messagePtr[i];
@@ -2240,13 +2240,10 @@
 
 		_sound->_talkChannel = _sound->playBundleSound(pointer);
 		_messagePtr = _transText;
-		setStringVars(0);
-		actorTalk();
-	} else {
-		setStringVars(0);
-		actorTalk();
-		_scriptPointer = _messagePtr;
 	}
+
+	setStringVars(0);
+	actorTalk();
 }
 
 void Scumm_v6::o6_talkEgo() {





More information about the Scummvm-git-logs mailing list