diff options
| author | Max Horn | 2005-03-31 23:04:46 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-31 23:04:46 +0000 |
| commit | 807b573ab253a2ab9eb2e667e346f42cb2a04064 (patch) | |
| tree | 0c7ac8694517d68118e2cb5a1fa2a638d66e9676 /scumm/palette.cpp | |
| parent | 204809625fbe3c83e3f398e99fd6c8b2a6a108b6 (diff) | |
| download | scummvm-rg350-807b573ab253a2ab9eb2e667e346f42cb2a04064.tar.gz scummvm-rg350-807b573ab253a2ab9eb2e667e346f42cb2a04064.tar.bz2 scummvm-rg350-807b573ab253a2ab9eb2e667e346f42cb2a04064.zip | |
Fix GF_OLD256 palette size (no idea if that has an effect anywhere)
svn-id: r17313
Diffstat (limited to 'scumm/palette.cpp')
| -rw-r--r-- | scumm/palette.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/palette.cpp b/scumm/palette.cpp index 7f8290d5da..e6a5fd7648 100644 --- a/scumm/palette.cpp +++ b/scumm/palette.cpp @@ -209,11 +209,12 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) { if (numcolor < 0) { if (_features & GF_SMALL_HEADER) { + ptr += _resourceHeaderSize; if (_features & GF_OLD256) - numcolor = 256; + numcolor = READ_LE_UINT16(ptr); else - numcolor = READ_LE_UINT16(ptr + 6) / 3; - ptr += 8; + numcolor = READ_LE_UINT16(ptr) / 3; + ptr += 2; } else { numcolor = getResourceDataSize(ptr) / 3; } |