aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-04-11 22:15:59 +0000
committerMax Horn2003-04-11 22:15:59 +0000
commitdbff83a88bbe2e384435c678abe861b4b82cfd63 (patch)
treefdc65bc61bb6d85ce2841576e7875e9ec25f9309 /scumm
parent6fef5f77ad87ae86a3012142d03c47e779199305 (diff)
downloadscummvm-rg350-dbff83a88bbe2e384435c678abe861b4b82cfd63.tar.gz
scummvm-rg350-dbff83a88bbe2e384435c678abe861b4b82cfd63.tar.bz2
scummvm-rg350-dbff83a88bbe2e384435c678abe861b4b82cfd63.zip
fixed resource loading in GF_OLD_BUNDLE games (res header = 2 bytes length, plus 2 unknown bytes)
svn-id: r6976
Diffstat (limited to 'scumm')
-rw-r--r--scumm/resource.cpp1
-rw-r--r--scumm/scummvm.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index f8bfa1875c..0feddab40f 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -568,6 +568,7 @@ int Scumm::loadResource(int type, int idx) {
if (_features & GF_OLD_BUNDLE) {
size = _fileHandle.readUint16LE();
+ _fileHandle.seek(-2, SEEK_CUR);
} else if (_features & GF_SMALL_HEADER) {
if (!(_features & GF_SMALL_NAMES))
_fileHandle.seek(8, SEEK_CUR);
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 70377dd17a..742ba30a6a 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1719,7 +1719,7 @@ void Scumm::launch() {
}
if (_features & GF_OLD_BUNDLE)
- _resourceHeaderSize = 2; // FIXME - to be rechecked
+ _resourceHeaderSize = 4; // FIXME - to be rechecked
else if (_features & GF_SMALL_HEADER)
_resourceHeaderSize = 6;
else