diff options
| author | Max Horn | 2003-10-04 11:50:21 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-04 11:50:21 +0000 |
| commit | d4734bd4f2963168f794691a618869ba4e558aaa (patch) | |
| tree | 6881cb61298534a4966533289bb81a2f0332a4c3 /sword2 | |
| parent | 91da08e1f3f836442c9c2ff39a9d1570f49df24d (diff) | |
| download | scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.tar.gz scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.tar.bz2 scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.zip | |
use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code
svn-id: r10592
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index eb160b7e27..856cddf8c6 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -180,7 +180,7 @@ void Sound::reverseStereo(void) { // after the credits. void Sound::saveMusicState() { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); int saveStream; @@ -203,7 +203,7 @@ void Sound::saveMusicState() { } void Sound::restoreMusicState() { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); int restoreStream; @@ -272,7 +272,7 @@ int32 Sound::isFxOpen(int32 id) { } void Sound::fxServer(int16 *data, uint len) { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); if (!_soundOn) return; @@ -899,7 +899,7 @@ uint8 Sound::isFxMute(void) { */ int32 Sound::streamCompMusic(const char *filename, uint32 musicId, bool looping) { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); uint32 len; int32 primaryStream = -1; @@ -1062,7 +1062,7 @@ int32 Sound::dipMusic() { */ int32 Sound::musicTimeRemaining() { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); for (int i = 0; i < MAXMUS; i++) { if (_music[i]._streaming && !_music[i]._fading) @@ -1077,7 +1077,7 @@ int32 Sound::musicTimeRemaining() { */ void Sound::stopMusic(void) { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); for (int i = 0; i < MAXMUS; i++) { if (_music[i]._streaming) @@ -1092,7 +1092,7 @@ void Sound::stopMusic(void) { */ void Sound::pauseMusic(void) { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); if (_soundOn) { for (int i = 0; i < MAXMUS; i++) { @@ -1110,7 +1110,7 @@ void Sound::pauseMusic(void) { */ void Sound::unpauseMusic(void) { - StackLock lock(_mutex); + Common::StackLock lock(_mutex); if (_soundOn) { for (int i = 0; i < MAXMUS; i++) |