[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.14,1.15 gfx.cpp,2.36,2.37 resource_v3.cpp,1.10,1.11

[Pawel Kolodziejski]

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

Modified Files:
	costume.cpp gfx.cpp resource_v3.cpp 
Log Message:
fixed reading Loom index file, and handle gfx for 16 colors games

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- costume.cpp	6 Mar 2003 21:45:54 -0000	1.14
+++ costume.cpp	7 Apr 2003 22:47:36 -0000	1.15
@@ -86,7 +86,7 @@
 	byte newAmiCost;
 	int ex1, ex2;
 	
-	newAmiCost = (_vm->_gameId == GID_MONKEY2 || _vm->_gameId == GID_INDY4) && (_vm->_features & GF_AMIGA);
+	newAmiCost = (_vm->_gameId == GID_MONKEY2 || _vm->_gameId == GID_INDY4) && ((_vm->_features & GF_AMIGA) || (_vm->_features & GF_16COLOR));
 
 	CHECK_HEAP
 	_maskval = 0xF;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -d -r2.36 -r2.37
--- gfx.cpp	2 Apr 2003 15:23:36 -0000	2.36
+++ gfx.cpp	7 Apr 2003 22:47:37 -0000	2.37
@@ -1025,7 +1025,7 @@
 	byte code = *smap_ptr++;
 	assert(numLinesToProcess);
 
-	if (_vm->_features & GF_AMIGA)
+	if ((_vm->_features & GF_AMIGA) || (_vm->_features & GF_16COLOR))
 		_palette_mod = 16;
 	else
 		_palette_mod = 0;

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- resource_v3.cpp	7 Apr 2003 06:34:42 -0000	1.10
+++ resource_v3.cpp	7 Apr 2003 22:47:38 -0000	1.11
@@ -39,7 +39,7 @@
 			warning("The magic id doesn't match (0x%X)\n", magic);
 
 		_numGlobalObjects = _fileHandle.readUint16LE();
-		_fileHandle.seek(_numGlobalObjects, SEEK_CUR); // Skip object flags
+		_fileHandle.seek(_numGlobalObjects * 4, SEEK_CUR);
 		_numRooms = _fileHandle.readByte();
 		_fileHandle.seek(_numRooms * 3, SEEK_CUR);
 		_numCostumes = _fileHandle.readByte();