diff options
| author | Einar Johan Trøan Sømåen | 2012-07-23 03:01:05 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-23 03:10:41 +0200 |
| commit | 448911930d8d6bf43a67769d50ee4048f296b7f4 (patch) | |
| tree | 5617248f0227062e80e58e5f0b13679c74b935ae /engines/wintermute/base/base_fader.cpp | |
| parent | dd6d093cf33f3ab3cf49f848ba6298733bad5831 (diff) | |
| download | scummvm-rg350-448911930d8d6bf43a67769d50ee4048f296b7f4.tar.gz scummvm-rg350-448911930d8d6bf43a67769d50ee4048f296b7f4.tar.bz2 scummvm-rg350-448911930d8d6bf43a67769d50ee4048f296b7f4.zip | |
WINTERMUTE: Remove unused code from platform_osystem.h
Diffstat (limited to 'engines/wintermute/base/base_fader.cpp')
| -rw-r--r-- | engines/wintermute/base/base_fader.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp index 4dcdf82347..c5f170bb43 100644 --- a/engines/wintermute/base/base_fader.cpp +++ b/engines/wintermute/base/base_fader.cpp @@ -29,7 +29,6 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/base/base_fader.h"
#include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/platform_osystem.h"
#include "common/util.h"
namespace WinterMute {
@@ -67,7 +66,7 @@ bool BaseFader::update() { uint32 time;
- if (_system) time = BasePlatform::getTime() - _startTime;
+ if (_system) time = g_system->getMillis() - _startTime;
else time = _gameRef->_timer - _startTime;
if (time >= _duration) _currentAlpha = _targetAlpha;
@@ -115,7 +114,7 @@ bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) { _duration = duration;
_system = system;
- if (_system) _startTime = BasePlatform::getTime();
+ if (_system) _startTime = g_system->getMillis();
else _startTime = _gameRef->_timer;
return STATUS_OK;
@@ -138,7 +137,7 @@ bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) { _duration = duration;
_system = system;
- if (_system) _startTime = BasePlatform::getTime();
+ if (_system) _startTime = g_system->getMillis();
else _startTime = _gameRef->_timer;
|