From 9b17bf31d44c32b338c8b6a307666320090e9030 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 16 Nov 2015 19:10:22 -0500 Subject: SHERLOCK: Fix Coverity warnings about uninitialized fields --- engines/sherlock/objects.cpp | 2 ++ engines/sherlock/scalpel/scalpel_saveload.cpp | 3 ++- engines/sherlock/scalpel/tsage/logo.cpp | 1 + engines/sherlock/tattoo/tattoo_darts.cpp | 1 + engines/sherlock/tattoo/widget_base.cpp | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index 0856c226f1..e70b707404 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -620,6 +620,7 @@ void Sprite::clear() { _images = nullptr; _imageFrame = nullptr; _walkCount = 0; + _oldWalkSequence = 0; _allow = 0; _frameNumber = 0; _position.x = _position.y = 0; @@ -634,6 +635,7 @@ void Sprite::clear() { _misc = 0; _altImages = nullptr; _altSeq = 0; + _centerWalk = 0; Common::fill(&_stopFrames[0], &_stopFrames[8], (ImageFrame *)nullptr); } diff --git a/engines/sherlock/scalpel/scalpel_saveload.cpp b/engines/sherlock/scalpel/scalpel_saveload.cpp index 01ba149813..61830a56b2 100644 --- a/engines/sherlock/scalpel/scalpel_saveload.cpp +++ b/engines/sherlock/scalpel/scalpel_saveload.cpp @@ -39,7 +39,8 @@ const int ENV_POINTS[6][3] = { /*----------------------------------------------------------------*/ -ScalpelSaveManager::ScalpelSaveManager(SherlockEngine *vm, const Common::String &target) : SaveManager(vm, target) { +ScalpelSaveManager::ScalpelSaveManager(SherlockEngine *vm, const Common::String &target) : + SaveManager(vm, target), _envMode(SAVEMODE_NONE) { } void ScalpelSaveManager::drawInterface() { diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp index 014470dcc8..273d26df74 100644 --- a/engines/sherlock/scalpel/tsage/logo.cpp +++ b/engines/sherlock/scalpel/tsage/logo.cpp @@ -163,6 +163,7 @@ Object::Object() { _angle = _changeCtr = 0; _walkStartFrame = 0; _majorDiff = _minorDiff = 0; + _updateStartFrame = 0; } void Object::setVisage(int visage, int strip) { diff --git a/engines/sherlock/tattoo/tattoo_darts.cpp b/engines/sherlock/tattoo/tattoo_darts.cpp index 274d80e3e1..512358933d 100644 --- a/engines/sherlock/tattoo/tattoo_darts.cpp +++ b/engines/sherlock/tattoo/tattoo_darts.cpp @@ -70,6 +70,7 @@ Darts::Darts(SherlockEngine *vm) : _vm(vm) { _handX = 0; _compPlay = 1; _escapePressed = false; + _spacing = 0; } void Darts::playDarts(GameType gameType) { diff --git a/engines/sherlock/tattoo/widget_base.cpp b/engines/sherlock/tattoo/widget_base.cpp index 9e10cee0d1..8f0649130a 100644 --- a/engines/sherlock/tattoo/widget_base.cpp +++ b/engines/sherlock/tattoo/widget_base.cpp @@ -33,6 +33,7 @@ namespace Tattoo { WidgetBase::WidgetBase(SherlockEngine *vm) : _vm(vm) { _scroll = false; _dialogTimer = 0; + _outsideMenu = false; } void WidgetBase::summonWindow() { -- cgit v1.2.3