[Scummvm-cvs-logs] scummvm master -> 0a6a76c478162f1f2067520792780f43d9f7f9e2

Strangerke Strangerke at scummvm.org
Tue Feb 25 08:16:05 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:
0a6a76c478 VOYEUR: Fix uninitialized variables in DisplayResource and RL2Decoder


Commit: 0a6a76c478162f1f2067520792780f43d9f7f9e2
    https://github.com/scummvm/scummvm/commit/0a6a76c478162f1f2067520792780f43d9f7f9e2
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-24T23:14:29-08:00

Commit Message:
VOYEUR: Fix uninitialized variables in DisplayResource and RL2Decoder

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



diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index 8e4b7fb..82cddc2 100644
--- a/engines/voyeur/animation.cpp
+++ b/engines/voyeur/animation.cpp
@@ -38,6 +38,9 @@ RL2Decoder::RL2Decoder(Audio::Mixer::SoundType soundType) : _soundType(soundType
 	_paletteStart = 0;
 	_fileStream = nullptr;
 	_soundFrameNumber = -1;
+
+	_audioTrack = nullptr;
+	_videoTrack = nullptr;
 }
 
 RL2Decoder::~RL2Decoder() {
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 78dc121..8205857 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -743,10 +743,12 @@ RectResource::RectResource(int x1, int y1, int x2, int y2) {
 
 DisplayResource::DisplayResource() {
 	_vm = NULL;
+	_flags = 0;
 }
 
 DisplayResource::DisplayResource(VoyeurEngine *vm) {
 	_vm = vm;
+	_flags = 0;
 }
 
 void DisplayResource::sFillBox(int width, int height) {






More information about the Scummvm-git-logs mailing list