aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-10-01 23:18:02 +0200
committerWillem Jan Palenstijn2013-10-01 23:20:42 +0200
commite0dd19a21cb07ab4704991800e23bf4ac2dfb0ef (patch)
tree66f304ce9bdcdb0c11495e889a69e1b2d889afd2
parent7e782dd5e9c1729064c90abeea2f99ee613a3b99 (diff)
downloadscummvm-rg350-e0dd19a21cb07ab4704991800e23bf4ac2dfb0ef.tar.gz
scummvm-rg350-e0dd19a21cb07ab4704991800e23bf4ac2dfb0ef.tar.bz2
scummvm-rg350-e0dd19a21cb07ab4704991800e23bf4ac2dfb0ef.zip
WINTERMUTE: Fix broken uint32/ulong cast
-rw-r--r--engines/wintermute/base/file/base_disk_file.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 7391d819fc..d15778c7cd 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -149,7 +149,8 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
}
if (compressed) {
- uint32 dataOffset, compSize, uncompSize;
+ uint32 dataOffset, compSize;
+ unsigned long uncompSize;
dataOffset = file->readUint32LE();
compSize = file->readUint32LE();
uncompSize = file->readUint32LE();
@@ -171,7 +172,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
file->seek(dataOffset + prefixSize, SEEK_SET);
file->read(compBuffer, compSize);
- if (Common::uncompress(data, (unsigned long *)&uncompSize, compBuffer, compSize) != true) {
+ if (Common::uncompress(data, &uncompSize, compBuffer, compSize) != true) {
error("Error uncompressing file '%s'", filename.c_str());
delete[] compBuffer;
delete file;