diff options
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/sequences_lol.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/sound_intern.h | 2 | ||||
-rw-r--r-- | engines/kyra/sound_towns.cpp | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index 01bf3c5e26..27f3951faf 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -202,7 +202,7 @@ void LoLEngine::setupPrologueData(bool load) { void LoLEngine::showIntro() { _tim = new TIMInterpreter(this, _screen, _system); assert(_tim); - + if (_flags.platform == Common::kPlatformPC98) showStarcraftLogo(); @@ -1115,7 +1115,7 @@ void LoLEngine::showOutro(int character, bool maxDifficulty) { showCredits(); _eventList.clear(); - + if (!shouldQuit()) { switch (character) { case 0: diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h index 2ba0890789..be3c09de96 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound_intern.h @@ -140,7 +140,7 @@ private: uint8 _sfxChannel; TownsEuphonyDriver *_driver; - + bool _cdaPlaying; const uint8 *_musicFadeTable; diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 73d435f3e5..012f1f5d7d 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -107,11 +107,11 @@ void SoundTowns::haltTrack() { g_system->getAudioCDManager()->stop(); g_system->getAudioCDManager()->updateCD(); _cdaPlaying = false; - + for (int i = 0; i < 6; i++) _driver->chanVolume(i, 0); for (int i = 0x40; i < 0x46; i++) - _driver->chanVolume(i, 0); + _driver->chanVolume(i, 0); for (int i = 0; i < 32; i++) _driver->configChan_enable(i, 0); _driver->stopParser(); @@ -128,7 +128,7 @@ void SoundTowns::loadSoundFile(uint file) { void SoundTowns::playSoundEffect(uint8 track) { if (!_sfxEnabled || !_sfxFileData) return; - + if (track == 0 || track == 10) { stopAllSoundEffects(); return; @@ -258,13 +258,13 @@ void SoundTowns::beginFadeOut() { uint16 fadeVolCur[12]; uint16 fadeVolStep[12]; - + for (int i = 0; i < 6; i++) { fadeVolCur[i] = READ_LE_UINT16(&_musicFadeTable[(_lastTrack * 12 + i) * 2]); fadeVolStep[i] = fadeVolCur[i] / 50; fadeVolCur[i + 6] = READ_LE_UINT16(&_musicFadeTable[(_lastTrack * 12 + 6 + i) * 2]); fadeVolStep[i + 6] = fadeVolCur[i + 6] / 30; - } + } for (int i = 0; i < 12; i++) { for (int ii = 0; ii < 6; ii++) @@ -344,7 +344,7 @@ void SoundTowns::playEuphonyTrack(uint32 offset, int loop) { uint32 trackSize = READ_LE_UINT32(_musicTrackData + 2048); uint8 startTick = _musicTrackData[2052]; - + _driver->setMusicTempo(_musicTrackData[2053]); src = _musicTrackData + 2054; |