[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.165,2.166

[James Brown]

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

Modified Files:
	script_v2.cpp 
Log Message:
Make prepositions work


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.165
retrieving revision 2.166
diff -u -d -r2.165 -r2.166
--- script_v2.cpp	5 Aug 2003 16:51:40 -0000	2.165
+++ script_v2.cpp	5 Aug 2003 16:57:47 -0000	2.166
@@ -952,14 +952,13 @@
 	
 		if ((_version == 1) && (VAR(VAR_SENTENCE_PREPOSITION) == 0)) {
 			byte *ptr = getOBCDFromObject(VAR(VAR_SENTENCE_OBJECT1)) + 12;
+			int prep = (*ptr >> 5);
 			VerbSlot *vs = &_verbs[slot];
 	
-			if (ptr) {
-				if (vs->prep == 0)
-					VAR(VAR_SENTENCE_PREPOSITION) = (*ptr >> 5);
-				else
-					VAR(VAR_SENTENCE_PREPOSITION) = vs->prep;
-			}
+			if (vs->prep == 0xFF)
+				VAR(VAR_SENTENCE_PREPOSITION) = (*ptr >> 5);
+			else
+				VAR(VAR_SENTENCE_PREPOSITION) = vs->prep;
 		}
 	}