[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.16,1.17

[Max Horn]

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

Modified Files:
	costume.cpp 
Log Message:
fixed costume code for OLD_BUNDLE (but boy, this is hackish... we rather should shift all the other costume datas by 2 or 4 bytes)

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- costume.cpp	8 Apr 2003 19:05:39 -0000	1.16
+++ costume.cpp	12 Apr 2003 19:51:14 -0000	1.17
@@ -1184,11 +1184,17 @@
 void LoadedCostume::loadCostume(int id) {
 	_ptr = _vm->getResourceAddress(rtCostume, id);
 
-	if (_vm->_features & GF_AFTER_V6) {
+printf("Costume %d:\n", id);
+hexdump(_ptr, 0x40);
+
+	if (_vm->_features & GF_AFTER_V6)
 		_ptr += 8;
-	} else if (!(_vm->_features & GF_SMALL_HEADER)) {
+	else if (_vm->_features & GF_OLD_BUNDLE)
+		_ptr += -2;
+	else if (_vm->_features & GF_SMALL_HEADER)
+		_ptr += 0;
+	else
 		_ptr += 2;
-	}
 
 	switch (_ptr[7] & 0x7F) {
 	case 0x58: