[Scummvm-cvs-logs] scummvm master -> bcca831c6813aa1a52b478c6b2f40ac2ee108ed5

Strangerke Strangerke at scummvm.org
Wed Feb 26 07:41:24 CET 2014


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:
bcca831c68 VOYEUR: Fix some more uninitialized variables


Commit: bcca831c6813aa1a52b478c6b2f40ac2ee108ed5
    https://github.com/scummvm/scummvm/commit/bcca831c6813aa1a52b478c6b2f40ac2ee108ed5
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-25T22:39:46-08:00

Commit Message:
VOYEUR: Fix some more uninitialized variables

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



diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index cff3947..6869947 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 8205857..e5f525a 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() {






More information about the Scummvm-git-logs mailing list