diff options
| author | Einar Johan Trøan Sømåen | 2013-04-18 12:13:12 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-04-18 12:13:12 +0200 |
| commit | 32ace5f9d204e746ab8503220749e194ab91508c (patch) | |
| tree | 3fbe88ff9ca3079ef8be5fb1c34883ae02a6a283 /engines/wintermute/base/base_fader.cpp | |
| parent | 8f25b651e8fc05dc29e6ea5fff5eba1c8df78697 (diff) | |
| download | scummvm-rg350-32ace5f9d204e746ab8503220749e194ab91508c.tar.gz scummvm-rg350-32ace5f9d204e746ab8503220749e194ab91508c.tar.bz2 scummvm-rg350-32ace5f9d204e746ab8503220749e194ab91508c.zip | |
WINTERMUTE: Avoid including BaseGame in BaseFader.
Diffstat (limited to 'engines/wintermute/base/base_fader.cpp')
| -rw-r--r-- | engines/wintermute/base/base_fader.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp index 079304520b..0d17b07a9d 100644 --- a/engines/wintermute/base/base_fader.cpp +++ b/engines/wintermute/base/base_fader.cpp @@ -27,7 +27,8 @@ */ #include "engines/wintermute/base/base_fader.h" -#include "engines/wintermute/base/base_game.h" +#include "engines/wintermute/base/base_engine.h" +#include "engines/wintermute/base/timer.h" #include "engines/wintermute/base/gfx/base_renderer.h" #include "common/util.h" @@ -71,7 +72,7 @@ bool BaseFader::update() { if (_system) { time = g_system->getMillis() - _startTime; } else { - time = _gameRef->getTimer()->getTime() - _startTime; + time = BaseEngine::getTimer()->getTime() - _startTime; } if (time >= _duration) { @@ -97,7 +98,7 @@ bool BaseFader::display() { } if (_currentAlpha > 0x00) { - _gameRef->_renderer->fadeToColor(_red, _green, _blue, _currentAlpha); + BaseEngine::getRenderer()->fadeToColor(_red, _green, _blue, _currentAlpha); } return STATUS_OK; } @@ -129,7 +130,7 @@ bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) { if (_system) { _startTime = g_system->getMillis(); } else { - _startTime = _gameRef->getTimer()->getTime(); + _startTime = BaseEngine::getTimer()->getTime(); } return STATUS_OK; @@ -155,7 +156,7 @@ bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) { if (_system) { _startTime = g_system->getMillis(); } else { - _startTime = _gameRef->getTimer()->getTime(); + _startTime = BaseEngine::getTimer()->getTime(); } |