aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Hoops2010-01-03 04:46:00 +0000
committerMatthew Hoops2010-01-03 04:46:00 +0000
commit7d5e91337e31f89b28a85b65ce09d88b0e698040 (patch)
tree406fd4700066309b81cbea62802d13ee88e99789
parent6ba2bd8bfcd622d0651a81aa70813d6140f2377d (diff)
downloadscummvm-rg350-7d5e91337e31f89b28a85b65ce09d88b0e698040.tar.gz
scummvm-rg350-7d5e91337e31f89b28a85b65ce09d88b0e698040.tar.bz2
scummvm-rg350-7d5e91337e31f89b28a85b65ce09d88b0e698040.zip
Fix the GK1 view segfault. szUnpacked was overflowing in SCI32 -- it should be uint32. GK1 now is a bit more playable, with many many glitches.
svn-id: r46917
-rw-r--r--engines/sci/resource.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 5e931ad255..1daf1c0fd5 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1430,8 +1430,8 @@ int ResourceManager::readResourceInfo(Resource *res, Common::File *file,
// SCI1 volume format: {bResType wResNumber wPacked+4 wUnpacked wCompression} = 9 bytes
// SCI1.1 volume format: {bResType wResNumber wPacked wUnpacked wCompression} = 9 bytes
// SCI32 volume format : {bResType wResNumber dwPacked dwUnpacked wCompression} = 13 bytes
- uint16 w, number, szUnpacked;
- uint32 wCompression;
+ uint16 w, number;
+ uint32 wCompression, szUnpacked;
ResourceType type;
switch (_volVersion) {