aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel
diff options
context:
space:
mode:
authorEugene Sandulenko2016-06-17 11:49:54 +0200
committerEugene Sandulenko2016-06-17 12:10:11 +0200
commit4dc60b525d4d7f36ce161e705a2752cd4ac142b4 (patch)
treee51bde31269a7c50a273ad40a0af727960c73fa3 /engines/tinsel
parent9131976ff4a52eacebe4bd4efd6f71b6230bb61c (diff)
downloadscummvm-rg350-4dc60b525d4d7f36ce161e705a2752cd4ac142b4.tar.gz
scummvm-rg350-4dc60b525d4d7f36ce161e705a2752cd4ac142b4.tar.bz2
scummvm-rg350-4dc60b525d4d7f36ce161e705a2752cd4ac142b4.zip
TINSEL: Fix class initialization
Diffstat (limited to 'engines/tinsel')
-rw-r--r--engines/tinsel/music.cpp6
-rw-r--r--engines/tinsel/tinsel.cpp3
2 files changed, 8 insertions, 1 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 32d5abb865..dc7ca67cfe 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -401,7 +401,7 @@ MidiMusicPlayer::MidiMusicPlayer(TinselEngine *vm) {
if (milesAudioEnabled) {
// Discworld 1 (DOS) uses Miles Audio 3
// use our own Miles Audio drivers
- //
+ //
// It seems that there are multiple versions of Discworld 1
//
// Version 1:
@@ -639,10 +639,14 @@ PCMMusicPlayer::PCMMusicPlayer() {
_dimmed = false;
_dimmedTinsel = false;
_dimIteration = 0;
+ _dimmedVolume = 0;
+ _dimPosition = 0;
_fadeOutVolume = 0;
_fadeOutIteration = 0;
+ _hScript = _hSegment = 0;
+
_end = true;
_vm->_mixer->playStream(Audio::Mixer::kMusicSoundType,
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 1b733a08ba..44e81494f7 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -823,6 +823,9 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc)
_console(0), _sound(0), _midiMusic(0), _pcmMusic(0), _bmv(0) {
_vm = this;
+ _gameId = 0;
+ _driver = NULL;
+
_config = new Config(this);
// Register debug flags