diff options
author | Max Horn | 2008-01-06 00:09:05 +0000 |
---|---|---|
committer | Max Horn | 2008-01-06 00:09:05 +0000 |
commit | 1194495ad39ec8640f76c000825981952c44e6a8 (patch) | |
tree | d93e5fe95d8e05d3d5f241db9798453c99836f22 /engines/scumm/imuse_digi/dimuse_track.cpp | |
parent | e52591ac0ef9f7611f3ce9c2b8b3e975fb3a4d3e (diff) | |
download | scummvm-rg350-1194495ad39ec8640f76c000825981952c44e6a8.tar.gz scummvm-rg350-1194495ad39ec8640f76c000825981952c44e6a8.tar.bz2 scummvm-rg350-1194495ad39ec8640f76c000825981952c44e6a8.zip |
cleanup
svn-id: r30284
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse_track.cpp')
-rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index 3da2a5b56c..b2037d83fc 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -167,7 +167,7 @@ void IMuseDigital::setPriority(int soundId, int priority) { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; - if ((track->soundId == soundId) && track->used && !track->toBeRemoved) { + if (track->used && !track->toBeRemoved && (track->soundId == soundId)) { track->soundPriority = priority; } } @@ -179,7 +179,7 @@ void IMuseDigital::setVolume(int soundId, int volume) { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; - if ((track->soundId == soundId) && track->used && !track->toBeRemoved) { + if (track->used && !track->toBeRemoved && (track->soundId == soundId)) { track->vol = volume * 1000; } } @@ -190,7 +190,7 @@ void IMuseDigital::setHookId(int soundId, int hookId) { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; - if ((track->soundId == soundId) && track->used && !track->toBeRemoved) { + if (track->used && !track->toBeRemoved && (track->soundId == soundId)) { track->curHookId = hookId; } } @@ -230,7 +230,7 @@ void IMuseDigital::setPan(int soundId, int pan) { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; - if ((track->soundId == soundId) && track->used && !track->toBeRemoved) { + if (track->used && !track->toBeRemoved && (track->soundId == soundId)) { track->pan = pan; } } @@ -246,7 +246,7 @@ void IMuseDigital::selectVolumeGroup(int soundId, int volGroupId) { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; - if ((track->soundId == soundId) && track->used && !track->toBeRemoved) { + if (track->used && !track->toBeRemoved && (track->soundId == soundId)) { track->volGroupId = volGroupId; } } @@ -258,7 +258,7 @@ void IMuseDigital::setFade(int soundId, int destVolume, int delay60HzTicks) { for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) { Track *track = _track[l]; - if ((track->soundId == soundId) && track->used && !track->toBeRemoved) { + if (track->used && !track->toBeRemoved && (track->soundId == soundId)) { track->volFadeDelay = delay60HzTicks; track->volFadeDest = destVolume * 1000; track->volFadeStep = (track->volFadeDest - track->vol) * 60 * (1000 / _callbackFps) / (1000 * delay60HzTicks); |