[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.208,1.209

[Max Horn]

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

Modified Files:
	script_v6.cpp 
Log Message:
Disambiguate o6_jump execution (is _scriptPointer read before or after fetchScriptWordSigned() (which modifies _scriptPointer) is being called)

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- script_v6.cpp	10 Nov 2003 08:00:52 -0000	1.208
+++ script_v6.cpp	11 Nov 2003 13:47:53 -0000	1.209
@@ -681,7 +681,8 @@
 }
 
 void ScummEngine_v6::o6_jump() {
-	_scriptPointer += fetchScriptWordSigned();
+	int offset = fetchScriptWordSigned();
+	_scriptPointer += offset;
 }
 
 void ScummEngine_v6::o6_startScript() {
@@ -2872,7 +2873,7 @@
 	byte filename[100];
 
 	_msgPtrToAdd = filename;
-	_messagePtr =_scriptPointer;
+	_messagePtr = _scriptPointer;
 	addMessageToStack(_messagePtr);
 
 	len = resStrLen(_scriptPointer);
@@ -2916,7 +2917,7 @@
 	byte filename[100];
 
 	_msgPtrToAdd = filename;
-	_messagePtr =_scriptPointer;
+	_messagePtr = _scriptPointer;
 	addMessageToStack(_messagePtr);
 
 	len = resStrLen(_scriptPointer);