diff options
| author | Strangerke | 2016-06-13 07:33:17 +0200 |
|---|---|---|
| committer | Strangerke | 2016-06-13 07:33:17 +0200 |
| commit | 013406abdd6873545ca5466b604a09a2b0afb4ae (patch) | |
| tree | 591d63e66ee66628cf5fbc254de830777f554414 | |
| parent | 010e676184efceac039a7e26927996dcae441c74 (diff) | |
| download | scummvm-rg350-013406abdd6873545ca5466b604a09a2b0afb4ae.tar.gz scummvm-rg350-013406abdd6873545ca5466b604a09a2b0afb4ae.tar.bz2 scummvm-rg350-013406abdd6873545ca5466b604a09a2b0afb4ae.zip | |
SHERLOCK: Fix uninitialized variables
| -rw-r--r-- | engines/sherlock/music.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/objects.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index c52c30191a..da4aec6994 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 644c0c74c9..a05351b170 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() { |