aboutsummaryrefslogtreecommitdiff
path: root/sword2
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-10-08 17:09:51 +0000
committerTorbjörn Andersson2003-10-08 17:09:51 +0000
commita1f4dc2c90efd28d30eec2b947ffe9d619ad0989 (patch)
tree04ea92cfd7aa97734d776f0bfd8286003565b196 /sword2
parent91fc9accbb1b7bf4a09baacd9bef35cc6fdfc39f (diff)
downloadscummvm-rg350-a1f4dc2c90efd28d30eec2b947ffe9d619ad0989.tar.gz
scummvm-rg350-a1f4dc2c90efd28d30eec2b947ffe9d619ad0989.tar.bz2
scummvm-rg350-a1f4dc2c90efd28d30eec2b947ffe9d619ad0989.zip
cleanup
svn-id: r10681
Diffstat (limited to 'sword2')
-rw-r--r--sword2/driver/d_sound.cpp19
1 files changed, 6 insertions, 13 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index acb3c01d18..cb018b89e7 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -169,11 +169,8 @@ Sound::~Sound() {
*/
void Sound::reverseStereo(void) {
- for (int i = 0; i < 16; i++) {
- int j = panTable[i];
- panTable[i] = panTable[32 - i];
- panTable[32 - i] = j;
- }
+ for (int i = 0; i < 16; i++)
+ SWAP(panTable[i], panTable[32 - i]);
}
// Save/Restore information about current music so that we can restore it
@@ -1088,20 +1085,16 @@ void Sound::stopMusic(void) {
}
/**
- * Stops the music dead in its tracks.
+ * Stops the music dead in its tracks. Any music that is currently being
+ * streamed is paued.
*/
void Sound::pauseMusic(void) {
Common::StackLock lock(_mutex);
if (_soundOn) {
- for (int i = 0; i < MAXMUS; i++) {
- if (_music[i]._streaming) {
- _music[i]._paused = true;
- } else {
- _music[i]._paused = false;
- }
- }
+ for (int i = 0; i < MAXMUS; i++)
+ _music[i]._paused = _music[i]._streaming;
}
}