diff options
author | Sven Hesse | 2007-07-25 04:52:12 +0000 |
---|---|---|
committer | Sven Hesse | 2007-07-25 04:52:12 +0000 |
commit | 5c588e1f5e4b80fb345f14a3a2cafcf8c6fdc352 (patch) | |
tree | 6c267207ad32c451e003a669c003c596abda5572 /engines/gob | |
parent | 7490b935c5ca769f52c13e92d07f05f8c430836f (diff) | |
download | scummvm-rg350-5c588e1f5e4b80fb345f14a3a2cafcf8c6fdc352.tar.gz scummvm-rg350-5c588e1f5e4b80fb345f14a3a2cafcf8c6fdc352.tar.bz2 scummvm-rg350-5c588e1f5e4b80fb345f14a3a2cafcf8c6fdc352.zip |
Updated loadExtData() for Woodruff. Now the Sierra logo is shown (then it crashes / freezes)
svn-id: r28188
Diffstat (limited to 'engines/gob')
-rw-r--r-- | engines/gob/game.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 83c74626cd..561330deac 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -140,8 +140,18 @@ byte *Game::loadExtData(int16 itemId, int16 *pResWidth, size = item->size; isPacked = (item->width & 0x8000) != 0; - if (pResWidth != 0) { + if ((pResWidth != 0) && (pResHeight != 0)) { *pResWidth = item->width & 0x7FFF; + + if (*pResWidth & 0x4000) + size += 1 << 16; + if (*pResWidth & 0x2000) + size += 2 << 16; + if (*pResWidth & 0x1000) + size += 4 << 16; + + *pResWidth &= 0xFFF; + *pResHeight = item->height; debugC(7, kDebugFileIO, "loadExtData(%d, %d, %d)", itemId, *pResWidth, *pResHeight); |