[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.105,2.106

[James Brown]

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

Modified Files:
	script_v2.cpp 
Log Message:
Fix sentence building


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.105
retrieving revision 2.106
diff -u -d -r2.105 -r2.106
--- script_v2.cpp	22 May 2003 11:40:20 -0000	2.105
+++ script_v2.cpp	22 May 2003 12:30:19 -0000	2.106
@@ -867,18 +867,15 @@
 	case 1:
 		// Execute the sentence
 		_sentenceNum--;
-		//warning("TODO o2_doSentence(%d, %d, %d): execute", st->verb, st->objectA, st->objectB);
-
-		// FIXME / TODO: The following is hackish, and probably incomplete, but it works somewhat.
-		VAR(VAR_ACTIVE_VERB) = st->verb;
-		VAR(VAR_ACTIVE_OBJECT1) = st->objectA;
-		VAR(VAR_ACTIVE_OBJECT2) = st->objectB;
 		
-		if (st->verb == 250)
-			runObjectScript(st->objectA, 253, false, true, NULL);
-		else
-			runObjectScript(st->objectA, st->verb, false, false, NULL);
+		if (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, true, NULL);
 		break;
 	case 2:
 		// Print the sentence