aboutsummaryrefslogtreecommitdiff
path: root/sword2/driver
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-01-12 08:01:25 +0000
committerTorbjörn Andersson2004-01-12 08:01:25 +0000
commitc75f5efd2f1b5fc6addcd67bc4865c2caeab8a6c (patch)
tree6bbf8d84a0305cd9bc1fdc193630852ad1fe076b /sword2/driver
parente792b1c715af482e2907d8cdfa3c84f0e04cbd31 (diff)
downloadscummvm-rg350-c75f5efd2f1b5fc6addcd67bc4865c2caeab8a6c.tar.gz
scummvm-rg350-c75f5efd2f1b5fc6addcd67bc4865c2caeab8a6c.tar.bz2
scummvm-rg350-c75f5efd2f1b5fc6addcd67bc4865c2caeab8a6c.zip
Sync the credits so that the text scroll and music will last for about the
same amount of time. I don't think the original did this, but it turned out to be pretty easy. svn-id: r12334
Diffstat (limited to 'sword2/driver')
-rw-r--r--sword2/driver/d_sound.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index dc1666d673..5a15aed16f 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -349,11 +349,6 @@ void Sound::saveMusicState(void) {
void Sound::restoreMusicState(void) {
Common::StackLock lock(_mutex);
- int restoreStream;
-
- if (!_music[2]._streaming)
- return;
-
// Fade out any music that happens to be playing
for (int i = 0; i < MAXMUS; i++) {
@@ -361,6 +356,11 @@ void Sound::restoreMusicState(void) {
_music[i].fadeDown();
}
+ if (!_music[2]._streaming)
+ return;
+
+ int restoreStream;
+
if (!_music[0]._streaming)
restoreStream = 0;
else