aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/music.cpp
diff options
context:
space:
mode:
authorMax Horn2006-10-21 12:44:10 +0000
committerMax Horn2006-10-21 12:44:10 +0000
commit9edf1e6a1a95f45b9883e298edc7e578ff9495d1 (patch)
tree897a46c0e4bbc22c8422bd3b96545bfeea3a4a0f /engines/saga/music.cpp
parent86d3f30347d5ee7ee67a4f16d5043b9bef0539db (diff)
downloadscummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.gz
scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.tar.bz2
scummvm-rg350-9edf1e6a1a95f45b9883e298edc7e578ff9495d1.zip
cleanup
svn-id: r24407
Diffstat (limited to 'engines/saga/music.cpp')
-rw-r--r--engines/saga/music.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index bacf726626..f4af44f826 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -346,7 +346,7 @@ void Music::musicVolumeGauge() {
_player->setVolume(volume);
if (_currentVolumePercent == 100) {
- Common::g_timer->removeTimerProc(&musicVolumeGaugeCallback);
+ _vm->_timer->removeTimerProc(&musicVolumeGaugeCallback);
_currentVolume = _targetVolume;
}
}
@@ -361,12 +361,12 @@ void Music::setVolume(int volume, int time) {
if (time == 1) {
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
_player->setVolume(volume);
- Common::g_timer->removeTimerProc(&musicVolumeGaugeCallback);
+ _vm->_timer->removeTimerProc(&musicVolumeGaugeCallback);
_currentVolume = volume;
return;
}
- Common::g_timer->installTimerProc(&musicVolumeGaugeCallback, time * 100L, this);
+ _vm->_timer->installTimerProc(&musicVolumeGaugeCallback, time * 100L, this);
}
bool Music::isPlaying() {