aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-02-25 08:14:29 +0100
committerStrangerke2014-02-25 08:14:29 +0100
commit0a6a76c478162f1f2067520792780f43d9f7f9e2 (patch)
treed59a6c8bffaf25526b6ddf3e5f601df5a702b433
parenteda34075c12a612ffb17ea39d524467233b288bf (diff)
downloadscummvm-rg350-0a6a76c478162f1f2067520792780f43d9f7f9e2.tar.gz
scummvm-rg350-0a6a76c478162f1f2067520792780f43d9f7f9e2.tar.bz2
scummvm-rg350-0a6a76c478162f1f2067520792780f43d9f7f9e2.zip
VOYEUR: Fix uninitialized variables in DisplayResource and RL2Decoder
-rw-r--r--engines/voyeur/animation.cpp3
-rw-r--r--engines/voyeur/files.cpp2
2 files changed, 5 insertions, 0 deletions
diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index 8e4b7fb975..82cddc258f 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 78dc121223..8205857b9d 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) {