aboutsummaryrefslogtreecommitdiff
path: root/sword2/function.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-02-08 08:32:50 +0000
committerTorbjörn Andersson2005-02-08 08:32:50 +0000
commitfe3e01a11044ded5079412680c0e0b921c1e6b80 (patch)
tree28473536236c51084c1a9869e10c5a0ddb9204ef /sword2/function.cpp
parentd6be4f03a7491530f5a2e944aa96c49855002b90 (diff)
downloadscummvm-rg350-fe3e01a11044ded5079412680c0e0b921c1e6b80.tar.gz
scummvm-rg350-fe3e01a11044ded5079412680c0e0b921c1e6b80.tar.bz2
scummvm-rg350-fe3e01a11044ded5079412680c0e0b921c1e6b80.zip
Now there are two file handles for the music: one for each CD. This is not
the same thing as one for each music stream. If both music streams are playing music from the same CD, they will both take turns at using the same file handle. The only case where both file handles are used is when music from one CD is fading in while music from the other CD is fading out. Which of course can only happen if you play the game from hard disk. If the game has to ask for the other CD, it kills the music immediately. The reason for doing this is that there was some concern about whether having two file handles open to the same file was portable or not. I don't think that question was ever fully answered, so I avoid the situation. svn-id: r16753
Diffstat (limited to 'sword2/function.cpp')
-rw-r--r--sword2/function.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sword2/function.cpp b/sword2/function.cpp
index 9aa800bb8b..748de8bec4 100644
--- a/sword2/function.cpp
+++ b/sword2/function.cpp
@@ -2095,7 +2095,7 @@ int32 Logic::fnPlayMusic(int32 *params) {
int32 Logic::fnStopMusic(int32 *params) {
// params: none
- _vm->_sound->stopMusic();
+ _vm->_sound->stopMusic(false);
return IR_CONT;
}