From 8f25b651e8fc05dc29e6ea5fff5eba1c8df78697 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Thu, 18 Apr 2013 12:10:40 +0200 Subject: WINTERMUTE: Split the timers from BaseGame into a separate class. --- engines/wintermute/base/base_fader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/wintermute/base/base_fader.cpp') 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(); } -- cgit v1.2.3