[Scummvm-cvs-logs] scummvm master -> 1e45673b4d930b2266ca05006a80cc48509b6226

[Strangerke]

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:
1e45673b4d VOYEUR: Fix some uninitialized variables


Commit: 1e45673b4d930b2266ca05006a80cc48509b6226
    https://github.com/scummvm/scummvm/commit/1e45673b4d930b2266ca05006a80cc48509b6226
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-08T14:26:25+01:00

Commit Message:
VOYEUR: Fix some uninitialized variables

Changed paths:
    engines/voyeur/data.cpp
    engines/voyeur/events.cpp
    engines/voyeur/files.cpp



diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp
index 9e29ae4..3ab5716 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 4c1ed41..03ea4d3 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 9d1ff58..b93388c 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;