SHERLOCK: Initialize some variables

2 files changed, 7 insertions, 0 deletions

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index e52b22b977..c1aebda2b3 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -53,6 +53,9 @@ MidiParser_SH::MidiParser_SH() {
 	_ppqn = 1;
 	setTempo(16667);
 	_data = nullptr;
+	_beats = 0;
+	_lastEvent = 0;
+	_trackEnd = nullptr;
 }
 
 void MidiParser_SH::parseNextEvent(EventInfo &info) {
@@ -197,6 +200,9 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	}
 	_midiParser.setMidiDriver(_driver);
 	_midiParser.setTimerRate(_driver->getBaseTempo());
+
+	_musicPlaying = false;
+	_musicOn = true;
 }
 
 bool Music::loadSong(int songNumber) {
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index b9762d22de..a923cf9e57 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -57,6 +57,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
 	_soundPlaying = false;
 	_soundIsOn = &_soundPlaying;
 	_curPriority = 0;
+	_digiBuf = nullptr;
 
 	_soundOn = true;
 	_speechOn = true;