aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-02-26 07:22:09 +0100
committerStrangerke2014-02-26 07:22:44 +0100
commit27a098cd657350bb8481c19f38c2960a3d876f0d (patch)
tree619e0c5daad886e745a298ec6e3d3dd6e91cdc58
parentc47d8a4597c499f1493fe0da99d32f5790cd3df3 (diff)
downloadscummvm-rg350-27a098cd657350bb8481c19f38c2960a3d876f0d.tar.gz
scummvm-rg350-27a098cd657350bb8481c19f38c2960a3d876f0d.tar.bz2
scummvm-rg350-27a098cd657350bb8481c19f38c2960a3d876f0d.zip
VOYEUR: Fix a couple of uninitialized variables in RL2VideoTrack and GraphicsManager
-rw-r--r--engines/voyeur/animation.cpp5
-rw-r--r--engines/voyeur/graphics.cpp1
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index 6c0a96faf2..40ea92f13b 100644
--- a/engines/voyeur/animation.cpp
+++ b/engines/voyeur/animation.cpp
@@ -227,13 +227,14 @@ RL2Decoder::RL2VideoTrack::RL2VideoTrack(const RL2FileHeader &header, RL2AudioTr
Common::SeekableReadStream *stream):
_header(header), _audioTrack(audioTrack), _fileStream(stream) {
+ _frameOffsets = nullptr;
+
// Set up surfaces
_surface = new Graphics::Surface();
_surface->create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
+ _backSurface = nullptr;
_hasBackFrame = header._backSize != 0;
-
- _backSurface = NULL;
if (_hasBackFrame)
initBackSurface();
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index 00f945e174..7f944ef8ab 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -49,6 +49,7 @@ GraphicsManager::GraphicsManager(): _defaultDrawInfo(1, Common::Point()), _drawP
_fontPtr = NULL;
Common::fill(&_VGAColors[0], &_VGAColors[PALETTE_SIZE], 0);
_fontChar = new PictureResource(0, 0xff, 0xff, 0, Common::Rect(), 0, NULL, 0);
+ _backColors = nullptr;
}
void GraphicsManager::sInitGraphics() {