[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.279,1.280 scumm.cpp,1.239,1.240 scumm.h,1.505,1.506

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12757/scumm

Modified Files:
	resource.cpp scumm.cpp scumm.h 
Log Message:

Definately Palettes.
Update HE todo.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- resource.cpp	30 Sep 2004 09:37:46 -0000	1.279
+++ resource.cpp	1 Oct 2004 11:22:59 -0000	1.280
@@ -2311,8 +2311,8 @@
 		_numSprites = _fileHandle.readUint16LE();
 		_numLocalScripts = _fileHandle.readUint16LE();
 		_fileHandle.readUint16LE(); // heap related
-		_fileHandle.readUint16LE(); // _numPalettes?
-		_fileHandle.readUint16LE(); // _numSmacker?
+		_numPalettes = _fileHandle.readUint16LE();
+		_fileHandle.readUint16LE(); // unknown
 		_numTalkies = _fileHandle.readUint16LE();
 		_numNewNames = 10;
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- scumm.cpp	30 Sep 2004 06:39:39 -0000	1.239
+++ scumm.cpp	1 Oct 2004 11:22:59 -0000	1.240
@@ -540,6 +540,7 @@
 	_numLocalScripts = 60;
 	_numSprites = 0;
 	_numTalkies = 0;
+	_numPalettes = 0;
 	_audioNames = NULL;
 	_numAudioNames = 0;
 	_curActor = 0;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -d -r1.505 -r1.506
--- scumm.h	30 Sep 2004 23:49:46 -0000	1.505
+++ scumm.h	1 Oct 2004 11:23:00 -0000	1.506
@@ -495,7 +495,7 @@
 	int _numInventory;
 	int _numNewNames, _numGlobalScripts;
 	int _numActors, _numRoomVariables;
-	int _numSprites, _numTalkies;
+	int _numPalettes, _numSprites, _numTalkies;
 public:
 	int _numLocalScripts, _numImages, _numRooms, _numScripts, _numSounds;	// Used by HE games
 	int _numCostumes;	// FIXME - should be protected, used by Actor::remapActorPalette