[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.66,1.67

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Mar 2 08:08:28 CET 2003


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

Modified Files:
	script_v6.cpp 
Log Message:
changed sub_FEE_78D2 func for scumm v7

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- script_v6.cpp	24 Feb 2003 04:37:20 -0000	1.66
+++ script_v6.cpp	2 Mar 2003 12:35:27 -0000	1.67
@@ -2970,8 +2970,13 @@
 
 static void sub_FEE_78D2(int num, int &arg1, int &arg2) {
 	byte *ptr = g_scumm->getResourceAddress(rtString, num);
-	arg1 = READ_LE_UINT16(ptr + 4);
-	arg2 = READ_LE_UINT16(ptr + 2);
+	if (g_scumm->_features & GF_AFTER_V7) {
+		arg1 = READ_LE_UINT32(ptr + 8);
+		arg2 = READ_LE_UINT32(ptr + 4);
+	} else {
+		arg1 = READ_LE_UINT16(ptr + 4);
+		arg2 = READ_LE_UINT16(ptr + 2);
+	}
 }
 
 static void sub_FEE_7822(int num, int arg1, int arg2) {





More information about the Scummvm-git-logs mailing list