[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.153,2.154

[Max Horn]

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

Modified Files:
	script_v2.cpp 
Log Message:
Patch #771154 (ZAK: yet another doSentence fix); this should fix bug #752293

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.153
retrieving revision 2.154
diff -u -d -r2.153 -r2.154
--- script_v2.cpp	14 Jul 2003 19:56:56 -0000	2.153
+++ script_v2.cpp	15 Jul 2003 00:23:18 -0000	2.154
@@ -824,7 +824,7 @@
 
 		// V1 Maniac verbs are relative to the 'verb area' - under the sentence
 		if ((_gameId == GID_MANIAC) && (_version == 1))
-			y+=9;
+			y+=8;
 
 		//printf("o2_verbOps: verb = %d, slot = %d, x = %d, y = %d, unk = %d, name = %s\n",
 		//		verb, slot, x, y, unk, _scriptPointer);
@@ -905,14 +905,16 @@
 		// Execute the sentence
 		_sentenceNum--;
 		
-		if (st->verb != 250 && st->verb != 253) {
+		if (st->verb == 254) {
+			stopObjectScript(st->objectA);
+		} else if (st->verb != 253 && st->verb != 250) {
 			VAR(VAR_ACTIVE_VERB) = st->verb;
 			VAR(VAR_ACTIVE_OBJECT1) = st->objectA;	
 			VAR(VAR_ACTIVE_OBJECT2) = st->objectB;
 
 			runObjectScript(st->objectA, st->verb, false, false, NULL);
 		} else
-			runObjectScript(st->objectA, 253, false, (st->verb == 250), NULL);
+			runObjectScript(st->objectA, 253, (st->verb == 250), true, NULL);
 		break;
 	case 2:
 		// Print the sentence