[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.126,1.127 script_v5.cpp,1.123,1.124

[Max Horn]

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

Modified Files:
	object.cpp script_v5.cpp 
Log Message:
seems monkeyega & monkeyvga have byte values for the object name offset, too

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- object.cpp	20 Jun 2003 10:53:06 -0000	1.126
+++ object.cpp	20 Jun 2003 11:14:18 -0000	1.127
@@ -926,17 +926,14 @@
 		return NULL;
 
 	if (_features & GF_SMALL_HEADER) {
-		int offset = 0;
+		byte offset = 0;
 
 		if (_version <= 2)
 			offset = *(objptr + 14);
 		else if (_features & GF_OLD_BUNDLE)
 			offset = *(objptr + 16);
-		else if (_version == 3)
-			offset = *(objptr + 18);
 		else
-			// FIXME: is this really correct?
-			offset = READ_LE_UINT16(objptr + 18);
+			offset = *(objptr + 18);
 
 		return (objptr + offset);
 	}

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- script_v5.cpp	20 Jun 2003 10:53:06 -0000	1.123
+++ script_v5.cpp	20 Jun 2003 11:14:18 -0000	1.124
@@ -1917,15 +1917,12 @@
 	}
 
 	if (_features & GF_SMALL_HEADER) {
-		int offset = 0;
+		byte offset = 0;
 
 		if (_features & GF_OLD_BUNDLE)
 			offset = *(objptr + 16);
-		else if (_version == 3)
-			offset = *(objptr + 18);
 		else
-			// FIXME: is this really correct?
-			offset = READ_LE_UINT16(objptr + 18);
+			offset = *(objptr + 18);
 
 		size = READ_LE_UINT16(objptr) - offset;
 		name = objptr + offset;