diff options
author | Torbjörn Andersson | 2004-05-01 10:42:23 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2004-05-01 10:42:23 +0000 |
commit | bc77ba431a7ccfc9a961df5fa8f1531e2f72fd44 (patch) | |
tree | b6b7ebc379d756ae3f869c314666fbdf09b94b87 /sword2/driver/animation.cpp | |
parent | e830d35a21fda5e28bcc290b37a922dbf4114224 (diff) | |
download | scummvm-rg350-bc77ba431a7ccfc9a961df5fa8f1531e2f72fd44.tar.gz scummvm-rg350-bc77ba431a7ccfc9a961df5fa8f1531e2f72fd44.tar.bz2 scummvm-rg350-bc77ba431a7ccfc9a961df5fa8f1531e2f72fd44.zip |
Simplified the handling of sound effects. It's not necessary for the driver
to keep its own copy of the sound data. It could be even further simplified
(I don't really see any reason for having two different sound queues), but
I seem to have reached a point of stability here and I don't want to jinx
it by making further changes yet.
svn-id: r13705
Diffstat (limited to 'sword2/driver/animation.cpp')
-rw-r--r-- | sword2/driver/animation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index 53dad119f5..b7d177ed84 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -326,8 +326,8 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], byte *mus // the animated cut-scenes, so this seems like a good place to close // both of them. - _vm->_sound->closeFx(-1); - _vm->_sound->closeFx(-2); + _vm->_sound->stopFx(-1); + _vm->_sound->stopFx(-2); return RD_OK; #else @@ -478,8 +478,8 @@ int32 MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte // the animated cut-scenes, so this seems like a good place to close // both of them. - _vm->_sound->closeFx(-1); - _vm->_sound->closeFx(-2); + _vm->_sound->stopFx(-1); + _vm->_sound->stopFx(-2); return RD_OK; } |