[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.337,1.338 script_v72he.cpp,2.306,2.307

[kirben]

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

Modified Files:
	resource.cpp script_v72he.cpp 
Log Message:

Fix regression, resID shouldn't beint16.
Slight correction to copyArrayHelper.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -d -r1.337 -r1.338
--- resource.cpp	14 Oct 2005 12:36:45 -0000	1.337
+++ resource.cpp	15 Oct 2005 00:46:08 -0000	1.338
@@ -750,6 +750,8 @@
 }
 
 byte *ScummEngine::getResourceAddress(int type, int idx) {
+	printf("getResourceAddress: type %d idx %d\n", type, idx);
+
 	byte *ptr;
 
 	CHECK_HEAP
@@ -757,6 +759,8 @@
 	if (_heversion >= 80 && type == rtString)
 		idx &= ~0x33539000;
 
+	printf("getResourceAddress2: type %d idx %d\n", type, idx);
+
 	if (!res.validateResource("getResourceAddress", type, idx))
 		return NULL;
 

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.306
retrieving revision 2.307
diff -u -d -r2.306 -r2.307
--- script_v72he.cpp	14 Oct 2005 12:36:46 -0000	2.306
+++ script_v72he.cpp	15 Oct 2005 00:46:08 -0000	2.307
@@ -1859,7 +1859,7 @@
 }
 
 void ScummEngine_v72he::o72_writeFile() {
-	int16 resID = pop();
+	int resID = pop();
 	int slot = pop();
 	byte subOp = fetchScriptByte();
 
@@ -2126,12 +2126,12 @@
 		*data = ah->data + offset;
 		break;
 	case kIntArray:
-		*num = (len1 - idx1) * 2;
+		*num = (len1 - idx1) * 2 + 2;
 		*size = pitch * 2;
 		*data = ah->data + offset * 2;
 		break;
 	case kDwordArray:
-		*num = (len1 - idx1) * 4;
+		*num = (len1 - idx1) * 4 + 4;
 		*size = pitch * 4;
 		*data = ah->data + offset * 4;
 		break;