diff options
| author | Einar Johan Trøan Sømåen | 2013-04-18 12:10:40 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-18 12:10:40 +0200 |
| commit | 8f25b651e8fc05dc29e6ea5fff5eba1c8df78697 (patch) | |
| tree | 14bd6bbe7177e586f55c2f83dc458d6508d9e6cc /engines/wintermute/base/base_game_music.cpp | |
| parent | 7ee757366b9aee0e6a59669d263e29b5fe20278e (diff) | |
| download | scummvm-rg350-8f25b651e8fc05dc29e6ea5fff5eba1c8df78697.tar.gz scummvm-rg350-8f25b651e8fc05dc29e6ea5fff5eba1c8df78697.tar.bz2 scummvm-rg350-8f25b651e8fc05dc29e6ea5fff5eba1c8df78697.zip | |
WINTERMUTE: Split the timers from BaseGame into a separate class.
Diffstat (limited to 'engines/wintermute/base/base_game_music.cpp')
| -rw-r--r-- | engines/wintermute/base/base_game_music.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/wintermute/base/base_game_music.cpp b/engines/wintermute/base/base_game_music.cpp index 8dff41d854..a39deb8d8d 100644 --- a/engines/wintermute/base/base_game_music.cpp +++ b/engines/wintermute/base/base_game_music.cpp @@ -177,7 +177,7 @@ bool BaseGameMusic::updateMusicCrossfade() { _music[_musicCrossfadeChannel2]->play(); } - uint32 currentTime = _gameRef->_liveTimer - _musicCrossfadeStartTime; + uint32 currentTime = _gameRef->getLiveTimer()->getTime() - _musicCrossfadeStartTime; if (currentTime >= _musicCrossfadeLength) { _musicCrossfadeRunning = false; @@ -469,7 +469,7 @@ bool BaseGameMusic::scCallMethod(ScScript *script, ScStack *stack, ScStack *this return STATUS_OK; } - _musicCrossfadeStartTime = _gameRef->_liveTimer; + _musicCrossfadeStartTime = _gameRef->getLiveTimer()->getTime(); _musicCrossfadeChannel1 = channel1; _musicCrossfadeChannel2 = channel2; _musicCrossfadeLength = fadeLength; |