From 4a0cdf00e1d90ee6a7baf74190f9e85f0a4eec27 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 17 Aug 2010 11:01:41 +0000 Subject: TINSEL: fix warning svn-id: r52149 --- engines/tinsel/tinsel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/tinsel/tinsel.cpp') diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 6c77a98dda..0f5b27c85a 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -283,7 +283,7 @@ static void SingleLeftProcess(CORO_PARAM, const void *param) { } while (DwGetCurrentTime() < _ctx->endTicks); if (GetProvNotProcessed()) { - Common::Point clickPos = *(Common::Point *)param; + const Common::Point clickPos = *(const Common::Point *)param; PlayerEvent(PLR_WALKTO, clickPos); } -- cgit v1.2.3 From 99c9ba697c0ae0296a3042166e09171123000525 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 25 Aug 2010 07:41:35 +0000 Subject: TINSEL: Fix bug #3032780: "DW: Mute setting does not work" Bug #3032778 was fixed too as it is the duplicate. Since there is no engine-specific logic, rely on superclass' setupSoundSettings(), and use it on startup too. svn-id: r52374 --- engines/tinsel/tinsel.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'engines/tinsel/tinsel.cpp') diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 0f5b27c85a..248c97e209 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -834,8 +834,7 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) DebugMan.addDebugChannel(kTinselDebugMusic, "music", "Music debugging"); // Setup mixer - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); + syncSoundSettings(); // Add DW2 subfolder to search path in case user is running directly from the CDs const Common::FSNode gameDataDir(ConfMan.get("path")); @@ -907,17 +906,6 @@ TinselEngine::~TinselEngine() { MemoryDeinit(); } -void TinselEngine::syncSoundSettings() { - // Sync the engine with the config manager - int soundVolumeMusic = ConfMan.getInt("music_volume"); - int soundVolumeSFX = ConfMan.getInt("sfx_volume"); - int soundVolumeSpeech = ConfMan.getInt("speech_volume"); - - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSFX); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech); -} - Common::String TinselEngine::getSavegameFilename(int16 saveNum) const { char filename[256]; snprintf(filename, 256, "%s.%03d", getTargetName().c_str(), saveNum); -- cgit v1.2.3 From 70fed746df6ab0ff7fe2c80725fb0c94b8ea821a Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 11 Sep 2010 05:28:54 +0000 Subject: TINSEL: Fix for #3032780 - Mute not respected in DW1 svn-id: r52674 --- engines/tinsel/tinsel.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'engines/tinsel/tinsel.cpp') diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 248c97e209..702606e84b 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -1169,7 +1169,11 @@ void TinselEngine::RestartDrivers() { } // Set midi volume - SetMidiVolume(_vm->_config->_musicVolume); + bool mute = false; + if (ConfMan.hasKey("mute")) + mute = ConfMan.getBool("mute"); + + SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume); } /** -- cgit v1.2.3 From f7f5a561eb389d1e31c50fd36b50178f9393c1ef Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 12 Sep 2010 14:18:40 +0000 Subject: TINSEL: Remove unused variable svn-id: r52684 --- engines/tinsel/tinsel.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'engines/tinsel/tinsel.cpp') diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 702606e84b..888a47648f 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -146,7 +146,6 @@ void KeyboardProcess(CORO_PARAM, const void *) { // Get the next keyboard event off the stack Common::Event evt = _vm->_keypresses.front(); _vm->_keypresses.pop_front(); - const Common::Point mousePos = _vm->getMousePosition(); // Switch for special keys switch (evt.kbd.keycode) { -- cgit v1.2.3 From 6588398ce6fab85e287b10c2781d3797d7639cb9 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 15 Sep 2010 22:00:20 +0000 Subject: MIDI: Send a reset MIDI device signal on startup. This is currently done in the engine code. I adapted AGI, AGOS, DRACI, GROOVIE, LURE, MADE, QUEEN, SAGA, SKY, TINSEL and TOUCHE to send a reset device on startup. The sound output still works fine (started up a game from every engine), so this should hopefully not introduce any regressions. As far as I can tell it seems that SCUMM does send a proper device reset, so I did not touch it. KYRA only sends a proper reset for MT-32 currently. I am not sure about SCI though. This fixes bug #3066826 "SIMON: MIDI notes off when using RTL after SCI". svn-id: r52736 --- engines/tinsel/tinsel.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/tinsel/tinsel.cpp') diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 888a47648f..bb6ed99138 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -867,6 +867,11 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) //_midiMusic->setNativeMT32(native_mt32); //_midiMusic->setAdLib(adlib); + if (native_mt32) + _driver->sendMT32Reset(); + else + _driver->sendGMReset(); + _musicVolume = ConfMan.getInt("music_volume"); _sound = new SoundManager(this); -- cgit v1.2.3