[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.66,2.67

Travis Howell kirben at users.sourceforge.net
Wed Sep 8 21:24:10 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21705/scumm

Modified Files:
	script_v72he.cpp 
Log Message:

Fix dog regression.


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.66
retrieving revision 2.67
diff -u -d -r2.66 -r2.67
--- script_v72he.cpp	9 Sep 2004 04:05:31 -0000	2.66
+++ script_v72he.cpp	9 Sep 2004 04:16:57 -0000	2.67
@@ -1773,10 +1773,27 @@
 }
 
 void ScummEngine_v72he::o72_unknownF1() {
-	int a = pop();
-	int b = pop();
-	debug(1,"o7_unknownF1 stub (%d, %d)", b, a);
-	push(-1);
+	byte *addr, *addr2;
+	byte chr, chr2;
+
+	int id = pop();
+	int id2 = pop();
+
+	addr = getStringAddress(id);
+	if (!addr)
+		error("o72_stringLen: Reference to zeroed array pointer (%d)", id);
+
+	addr2 = getStringAddress(id2);
+	if (!addr)
+		error("o72_stringLen: Reference to zeroed array pointer (%d)", id);
+
+	chr = *addr++;
+	chr2 = *addr2++;
+
+
+	debug(1,"o7_unknownF1 stub (%d, %d)", id, id2);
+
+	push(0);
 }
 
 void ScummEngine_v72he::o72_checkGlobQueue() {





More information about the Scummvm-git-logs mailing list