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_fader.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_fader.cpp')
| -rw-r--r-- | engines/wintermute/base/base_fader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp index 8f74d71caf..079304520b 100644 --- a/engines/wintermute/base/base_fader.cpp +++ b/engines/wintermute/base/base_fader.cpp @@ -71,7 +71,7 @@ bool BaseFader::update() { if (_system) { time = g_system->getMillis() - _startTime; } else { - time = _gameRef->_timer - _startTime; + time = _gameRef->getTimer()->getTime() - _startTime; } if (time >= _duration) { @@ -129,7 +129,7 @@ bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) { if (_system) { _startTime = g_system->getMillis(); } else { - _startTime = _gameRef->_timer; + _startTime = _gameRef->getTimer()->getTime(); } return STATUS_OK; @@ -155,7 +155,7 @@ bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) { if (_system) { _startTime = g_system->getMillis(); } else { - _startTime = _gameRef->_timer; + _startTime = _gameRef->getTimer()->getTime(); } |