aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2006-03-27 18:20:19 +0000
committerJohannes Schickel2006-03-27 18:20:19 +0000
commit518c7b871f4dca0a9dd767409071cb8e10925bbb (patch)
tree21e73b8e20ef4cd42c066788a8b042f36fd3dc58 /engines
parent7191d474a463a2821ce8cdb1c89b5481416985a0 (diff)
downloadscummvm-rg350-518c7b871f4dca0a9dd767409071cb8e10925bbb.tar.gz
scummvm-rg350-518c7b871f4dca0a9dd767409071cb8e10925bbb.tar.bz2
scummvm-rg350-518c7b871f4dca0a9dd767409071cb8e10925bbb.zip
Comments out unneeded code in enterNewScene (only used for cd audio version).
Fixes bug with stopping pegasus music before the animation finished. svn-id: r21469
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/scene.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/kyra/scene.cpp b/engines/kyra/scene.cpp
index ff2ffda549..6d81993aed 100644
--- a/engines/kyra/scene.cpp
+++ b/engines/kyra/scene.cpp
@@ -43,7 +43,8 @@ void KyraEngine::enterNewScene(int sceneId, int facing, int unk1, int unk2, int
_handleInput = false;
_abortWalkFlag = false;
_abortWalkFlag2 = false;
- if (_currentCharacter->sceneId == 7 && sceneId == 24) {
+ // just used for cd audio version, it should only load the sfx music file there
+ /*if (_currentCharacter->sceneId == 7 && sceneId == 24) {
_newMusicTheme = 3;
} else if (_currentCharacter->sceneId == 25 && sceneId == 109) {
_newMusicTheme = 4;
@@ -60,7 +61,7 @@ void KyraEngine::enterNewScene(int sceneId, int facing, int unk1, int unk2, int
}
if (_newMusicTheme != _curMusicTheme) {
snd_playTheme(_newMusicTheme);
- }
+ }*/
switch (_currentCharacter->sceneId) {
case 1: