[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.62,1.63

[Pawel Kolodziejski]

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

Modified Files:
	costume.cpp 
Log Message:
fixed costume header for v1

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- costume.cpp	19 Jun 2003 12:08:10 -0000	1.62
+++ costume.cpp	19 Jun 2003 15:52:17 -0000	1.63
@@ -509,19 +509,27 @@
 			const CostumeInfo *costumeInfo;
 			int xmoveCur, ymoveCur;
 
-			// FIXME: those are here just in case... you never now...
-			assert(_srcptr[1] == 0);
-			assert(_srcptr[3] == 0);
-		
-			costumeInfo = (const CostumeInfo *)_srcptr;
-			_width = READ_LE_UINT16(&costumeInfo->width);
-			_height = READ_LE_UINT16(&costumeInfo->height);
-			xmoveCur = _xmove + (int16)READ_LE_UINT16(&costumeInfo->rel_x);
-			ymoveCur = _ymove + (int16)READ_LE_UINT16(&costumeInfo->rel_y);
-			_xmove += (int16)READ_LE_UINT16(&costumeInfo->move_x);
-			_ymove -= (int16)READ_LE_UINT16(&costumeInfo->move_y);
-			_srcptr += 12;
+			if (_vm->_version == 1) {
+				_width = _srcptr[0];
+				_height = _srcptr[1];
+				xmoveCur = _xmove + _srcptr[2];
+				ymoveCur = _ymove + _srcptr[3];
+				_xmove += _srcptr[4];
+				_ymove -= _srcptr[5];
+			} else {
+				// FIXME: those are here just in case... you never now...
+				assert(_srcptr[1] == 0);
+				assert(_srcptr[3] == 0);
 		
+				costumeInfo = (const CostumeInfo *)_srcptr;
+				_width = READ_LE_UINT16(&costumeInfo->width);
+				_height = READ_LE_UINT16(&costumeInfo->height);
+				xmoveCur = _xmove + (int16)READ_LE_UINT16(&costumeInfo->rel_x);
+				ymoveCur = _ymove + (int16)READ_LE_UINT16(&costumeInfo->rel_y);
+				_xmove += (int16)READ_LE_UINT16(&costumeInfo->move_x);
+				_ymove -= (int16)READ_LE_UINT16(&costumeInfo->move_y);
+				_srcptr += 12;
+			}
 			return mainRoutine(xmoveCur, ymoveCur);
 		}
 	}