[Scummvm-cvs-logs] scummvm master -> 42cc71fef0c7d2f153a90f7fd7e0ca7849c2be75
Strangerke
Strangerke at scummvm.org
Wed Oct 30 00:47:44 CET 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
42cc71fef0 TOON: Fix CID 1002427, 1002428, 1002429
Commit: 42cc71fef0c7d2f153a90f7fd7e0ca7849c2be75
https://github.com/scummvm/scummvm/commit/42cc71fef0c7d2f153a90f7fd7e0ca7849c2be75
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-29T16:46:52-07:00
Commit Message:
TOON: Fix CID 1002427, 1002428, 1002429
Changed paths:
engines/toon/picture.cpp
engines/toon/resource.cpp
engines/toon/resource.h
engines/toon/script.cpp
diff --git a/engines/toon/picture.cpp b/engines/toon/picture.cpp
index 65cc3a7..4927f50 100644
--- a/engines/toon/picture.cpp
+++ b/engines/toon/picture.cpp
@@ -134,6 +134,11 @@ bool Picture::loadPicture(const Common::String &file) {
Picture::Picture(ToonEngine *vm) : _vm(vm) {
_data = NULL;
_palette = NULL;
+
+ _width = 0;
+ _height = 0;
+ _paletteEntries = 0;
+ _useFullPalette = false;
}
Picture::~Picture() {
diff --git a/engines/toon/resource.cpp b/engines/toon/resource.cpp
index 2d419ec..ffcabbd 100644
--- a/engines/toon/resource.cpp
+++ b/engines/toon/resource.cpp
@@ -285,6 +285,7 @@ void PakFile::close() {
}
PakFile::PakFile() {
+ _numFiles = 0;
}
PakFile::~PakFile() {
diff --git a/engines/toon/resource.h b/engines/toon/resource.h
index c80ac22..b432a1d 100644
--- a/engines/toon/resource.h
+++ b/engines/toon/resource.h
@@ -53,7 +53,6 @@ protected:
uint32 _numFiles;
Common::Array<File> _files;
- Common::File *_fileHandle;
};
class ToonEngine;
diff --git a/engines/toon/script.cpp b/engines/toon/script.cpp
index 69ae727..3e6738f 100644
--- a/engines/toon/script.cpp
+++ b/engines/toon/script.cpp
@@ -59,6 +59,8 @@ EMCInterpreter::EMCInterpreter(ToonEngine *vm) : _vm(vm), _scriptData(0), _filen
};
_opcodes = opcodes;
#undef OPCODE
+
+ _parameter = 0;
}
EMCInterpreter::~EMCInterpreter() {
More information about the Scummvm-git-logs
mailing list