aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur
diff options
context:
space:
mode:
authorStrangerke2014-02-26 07:39:46 +0100
committerStrangerke2014-02-26 07:39:46 +0100
commitbcca831c6813aa1a52b478c6b2f40ac2ee108ed5 (patch)
tree299d6a96af8d32ac347d13fe774d1cca71a3b2b4 /engines/voyeur
parent27a098cd657350bb8481c19f38c2960a3d876f0d (diff)
downloadscummvm-rg350-bcca831c6813aa1a52b478c6b2f40ac2ee108ed5.tar.gz
scummvm-rg350-bcca831c6813aa1a52b478c6b2f40ac2ee108ed5.tar.bz2
scummvm-rg350-bcca831c6813aa1a52b478c6b2f40ac2ee108ed5.zip
VOYEUR: Fix some more uninitialized variables
Diffstat (limited to 'engines/voyeur')
-rw-r--r--engines/voyeur/events.cpp4
-rw-r--r--engines/voyeur/files.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index cff394797b..686994722e 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -80,6 +80,9 @@ EventsManager::EventsManager(): _intPtr(_gameData),
_newLeftClick = _newRightClick = false;;
_videoDead = 0;
+
+ _fadeFirstCol = _fadeLastCol = 0;
+ _fadeCount = 1;
}
void EventsManager::resetMouse() {
@@ -373,7 +376,6 @@ void EventsManager::vDoFadeInt() {
return;
}
-
for (int i = _fadeFirstCol; i <= _fadeLastCol; ++i) {
ViewPortPalEntry &palEntry = _vm->_graphicsManager._viewPortListPtr->_palette[i];
byte *vgaP = &_vm->_graphicsManager._VGAColors[palEntry._palIndex * 3];
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 8205857b9d..e5f525a403 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -173,7 +173,7 @@ void BoltFilesState::nextBlock() {
/*------------------------------------------------------------------------*/
FilesManager::FilesManager() {
-
+ _curLibPtr = nullptr;
}
bool FilesManager::openBoltLib(const Common::String &filename, BoltFile *&boltFile) {
@@ -1158,6 +1158,7 @@ PictureResource::PictureResource(int flags, int select, int pick, int onOff,
_maskData = maskData;
_imgData = imgData;
_planeSize = planeSize;
+ _freeImgData = DisposeAfterUse::NO;
}
PictureResource::~PictureResource() {