[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.124,1.125 script_v5.cpp,1.121,1.122

[Max Horn]

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

Modified Files:
	object.cpp script_v5.cpp 
Log Message:
instead of casting to byte, rather allow offsets > 255

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- object.cpp	18 Jun 2003 22:35:03 -0000	1.124
+++ object.cpp	19 Jun 2003 18:08:39 -0000	1.125
@@ -926,14 +926,14 @@
 		return NULL;
 
 	if (_features & GF_SMALL_HEADER) {
-		byte offset = 0;
+		int offset = 0;
 
 		if (_version <= 2)
 			offset = *(objptr + 14);
 		else if (_features & GF_OLD_BUNDLE)
 			offset = *(objptr + 16);
 		else
-			offset = (byte) READ_LE_UINT16(objptr + 18);
+			offset = READ_LE_UINT16(objptr + 18);
 
 		return (objptr + offset);
 	}

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- script_v5.cpp	18 Jun 2003 22:35:03 -0000	1.121
+++ script_v5.cpp	19 Jun 2003 18:08:39 -0000	1.122
@@ -1917,12 +1917,12 @@
 	}
 
 	if (_features & GF_SMALL_HEADER) {
-		byte offset = 0;
+		int offset = 0;
 
 		if (_features & GF_OLD_BUNDLE)
 			offset = *(objptr + 16);
 		else
-			offset = (byte) READ_LE_UINT16(objptr + 18);
+			offset = READ_LE_UINT16(objptr + 18);
 
 		size = READ_LE_UINT16(objptr) - offset;
 		name = objptr + offset;