diff options
| author | Travis Howell | 2004-10-01 11:25:25 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-10-01 11:25:25 +0000 |
| commit | 9570bf38de35f680b551b9390e1690b0b8d704ea (patch) | |
| tree | dc9b812857d32a7620566a91026bc5394453dcfa /scumm | |
| parent | bfc61d2b0b8a3869b50afa2900095c705dd67409 (diff) | |
| download | scummvm-rg350-9570bf38de35f680b551b9390e1690b0b8d704ea.tar.gz scummvm-rg350-9570bf38de35f680b551b9390e1690b0b8d704ea.tar.bz2 scummvm-rg350-9570bf38de35f680b551b9390e1690b0b8d704ea.zip | |
Definately Palettes.
Update HE todo.
svn-id: r15369
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/resource.cpp | 4 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 1 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 0f165bada5..a6dd5c9d15 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -2311,8 +2311,8 @@ void ScummEngine::readMAXS(int blockSize) { _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; diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index bc3c1fd949..f629e231e7 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -540,6 +540,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _numLocalScripts = 60; _numSprites = 0; _numTalkies = 0; + _numPalettes = 0; _audioNames = NULL; _numAudioNames = 0; _curActor = 0; diff --git a/scumm/scumm.h b/scumm/scumm.h index e015ab5f71..921a7d2034 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -495,7 +495,7 @@ protected: 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 |