aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-03-08 14:26:25 +0100
committerStrangerke2014-03-08 14:26:25 +0100
commit1e45673b4d930b2266ca05006a80cc48509b6226 (patch)
tree01be492b1b74bf41e8048cc6d8a53c66544037bc /engines
parente752d38ac15360e78dd051e877785d6cc90fdcf6 (diff)
downloadscummvm-rg350-1e45673b4d930b2266ca05006a80cc48509b6226.tar.gz
scummvm-rg350-1e45673b4d930b2266ca05006a80cc48509b6226.tar.bz2
scummvm-rg350-1e45673b4d930b2266ca05006a80cc48509b6226.zip
VOYEUR: Fix some uninitialized variables
Diffstat (limited to 'engines')
-rw-r--r--engines/voyeur/data.cpp2
-rw-r--r--engines/voyeur/events.cpp3
-rw-r--r--engines/voyeur/files.cpp2
3 files changed, 7 insertions, 0 deletions
diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp
index 9e29ae4618..3ab5716991 100644
--- a/engines/voyeur/data.cpp
+++ b/engines/voyeur/data.cpp
@@ -90,6 +90,8 @@ SVoy::SVoy(VoyeurEngine *vm):_vm(vm) {
_events[i]._computerOff = 0;
_events[i]._dead = 0;
}
+ for (int i = 0; i < 6; i++)
+ _evCmPtrs[i] = nullptr;
}
void SVoy::addEvent(int hour, int minute, VoyeurEventType type, int audioVideoId,
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 4c1ed419a2..03ea4d3252 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -82,6 +82,9 @@ EventsManager::EventsManager(VoyeurEngine *vm) : _intPtr(_gameData),
_fadeFirstCol = _fadeLastCol = 0;
_fadeCount = 1;
+
+ for (int i = 0; i < 4; i++)
+ _cycleNext[i] = nullptr;
}
void EventsManager::startMainClockInt() {
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 9d1ff58b67..b93388c49e 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -1127,6 +1127,7 @@ PictureResource::PictureResource(Graphics::Surface *surface) {
_onOff = 0;
_maskData = 0;
_planeSize = 0;
+ _keyColor = 0;
_bounds = Common::Rect(0, 0, surface->w, surface->h);
_imgData = (byte *)surface->getPixels();
@@ -1140,6 +1141,7 @@ PictureResource::PictureResource() {
_onOff = 0;
_maskData = 0;
_planeSize = 0;
+ _keyColor = 0;
_imgData = NULL;
_freeImgData = DisposeAfterUse::NO;