SHERLOCK: Fix uninitialized variables

scummvm · Jun 13, 2016 · 013406a · 013406a
1 parent 010e676
commit 013406a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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() {