diff options
| author | Johannes Schickel | 2008-04-10 15:41:06 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-10 15:41:06 +0000 |
| commit | b54b9b34b4db5f88cb29e1be3d611dd72c539ece (patch) | |
| tree | 4abcd24de75ebddd6585a662e6980e20b8082b9c /engines | |
| parent | aac2b7019a1c9680a314e39b88b3b0d4911b7f87 (diff) | |
| download | scummvm-rg350-b54b9b34b4db5f88cb29e1be3d611dd72c539ece.tar.gz scummvm-rg350-b54b9b34b4db5f88cb29e1be3d611dd72c539ece.tar.bz2 scummvm-rg350-b54b9b34b4db5f88cb29e1be3d611dd72c539ece.zip | |
- Updated debug output for KyraEngine::snd_playTheme
- cleanup
svn-id: r31464
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/kyra.h | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/script_v2.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/sound.cpp | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h index 03aaf2915c..2fac6a039b 100644 --- a/engines/kyra/kyra.h +++ b/engines/kyra/kyra.h @@ -151,7 +151,7 @@ public: int resetGameFlag(int flag); // sound - virtual void snd_playTheme(int file, int track = 0); + virtual void snd_playTheme(int file, int track); virtual void snd_playSoundEffect(int id); virtual void snd_playWanderScoreViaMap(int command, int restart); virtual void snd_playVoiceFile(int id) = 0; diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 0d1130abb0..85f41b6269 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -401,7 +401,7 @@ void KyraEngine_v1::startup() { if (!_scriptInterpreter->loadScript("_NPC.EMC", _npcScriptData, &_opcodes)) error("Could not load \"_NPC.EMC\" script"); - snd_playTheme(1); + snd_playTheme(1, 0); if (_gameToLoad == -1) { enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1); if (_abortIntroFlag && _skipIntroFlag) { diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index 746f7b23e1..10023694e2 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -459,7 +459,7 @@ int KyraEngine_v2::o2_checkForItem(ScriptState *script) { int KyraEngine_v2::o2_loadSoundFile(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_loadSoundFile(%p) (%d)", (const void *)script, stackPos(0)); if (_sound->hasSoundFile(stackPos(0))) - snd_playTheme(stackPos(0)); + snd_playTheme(stackPos(0), -1); return 0; } diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 26b98e8e64..79ced963f4 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -460,13 +460,14 @@ void SoundMidiPC::beginFadeOut() { #pragma mark - void KyraEngine::snd_playTheme(int file, int track) { - debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine::snd_playTheme(%d)", file); + debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine::snd_playTheme(%d, %d)", file, track); if (_curMusicTheme == file) return; _curSfxFile = _curMusicTheme = file; _sound->loadSoundFile(_curMusicTheme); - _sound->playTrack(track); + if (track != -1) + _sound->playTrack(track); } void KyraEngine::snd_playSoundEffect(int track) { @@ -492,7 +493,7 @@ void KyraEngine::snd_playWanderScoreViaMap(int command, int restart) { assert(command*2+1 < _trackMapSize); if (_curMusicTheme != _trackMap[command*2]) { if (_trackMap[command*2] != -1 && _trackMap[command*2] != -2) - snd_playTheme(_trackMap[command*2]); + snd_playTheme(_trackMap[command*2], -1); } if (command != 1) { |