[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.163,2.164

James Brown ender at users.sourceforge.net
Tue Aug 5 09:49:18 CEST 2003


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

Modified Files:
	script_v2.cpp 
Log Message:
Forgot some V1 prep code


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.163
retrieving revision 2.164
diff -u -d -r2.163 -r2.164
--- script_v2.cpp	5 Aug 2003 16:43:33 -0000	2.163
+++ script_v2.cpp	5 Aug 2003 16:48:56 -0000	2.164
@@ -954,8 +954,12 @@
         	        byte *ptr = getOBCDFromObject(VAR(VAR_SENTENCE_OBJECT1)) + 12;
 			VerbSlot *vs = &_verbs[slot];
 
-			if (ptr && (vs->prep == 0xFF))
-				VAR(VAR_SENTENCE_PREPOSITION) = (*ptr >> 5);
+			if (ptr) {
+				if (vs->prep == 0)
+					VAR(VAR_SENTENCE_PREPOSITION) = (*ptr >> 5);
+				else
+					VAR(VAR_SENTENCE_PREPOSITION) = vs->prep;
+			}
         	}
 	}
 





More information about the Scummvm-git-logs mailing list