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/ad/ad_entity.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/ad/ad_entity.cpp')
| -rw-r--r-- | engines/wintermute/ad/ad_entity.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp index 259b68f291..6e47d0f072 100644 --- a/engines/wintermute/ad/ad_entity.cpp +++ b/engines/wintermute/ad/ad_entity.cpp @@ -627,7 +627,7 @@ bool AdEntity::update() { _tempSprite2 = _sentence->_currentSprite; } - bool timeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->_timer - _sentence->_startTime); + bool timeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->getTimer()->getTime() - _sentence->_startTime); if (_tempSprite2 == nullptr || _tempSprite2->isFinished() || (/*_tempSprite2->_looping &&*/ timeIsUp)) { if (timeIsUp) { _sentence->finish(); |