[Scummvm-cvs-logs] scummvm master -> 013406abdd6873545ca5466b604a09a2b0afb4ae

Strangerke Strangerke at scummvm.org
Mon Jun 13 07:42:31 CEST 2016


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:
013406abdd SHERLOCK: Fix uninitialized variables


Commit: 013406abdd6873545ca5466b604a09a2b0afb4ae
    https://github.com/scummvm/scummvm/commit/013406abdd6873545ca5466b604a09a2b0afb4ae
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-06-13T07:33:17+02:00

Commit Message:
SHERLOCK: Fix uninitialized variables

Changed paths:
    engines/sherlock/music.cpp
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index c52c301..da4aec6 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -226,6 +226,7 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_midiOption = false;
 	_midiMusicData = nullptr;
 	_musicVolume = ConfMan.hasKey("music_volume") ? ConfMan.getInt("music_volume") : 255;
+	_musicOn = false;
 
 	if (IS_3DO) {
 		// 3DO - uses digital samples for music
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 644c0c7..a05351b 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -636,7 +636,9 @@ void Sprite::clear() {
 	_altImages = nullptr;
 	_altSeq = 0;
 	_centerWalk = 0;
-	Common::fill(&_stopFrames[0], &_stopFrames[8], (ImageFrame *)nullptr);
+
+	for (int i = 0; i < 8; i++)
+		_stopFrames[i] = nullptr;
 }
 
 void Sprite::setImageFrame() {






More information about the Scummvm-git-logs mailing list