diff options
author | Einar Johan Trøan Sømåen | 2012-09-28 23:42:16 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-09-28 23:43:43 +0200 |
commit | b31d6212ffc35b987cfb7ee35a5ae3f75bf34a60 (patch) | |
tree | 8e94bdc735109f6adc5d39f62b34efe7e49f3ec3 /engines/wintermute/ad/ad_entity.cpp | |
parent | f6d7d05343375b05f5f487c0c9006fe2cdd7a387 (diff) | |
download | scummvm-rg350-b31d6212ffc35b987cfb7ee35a5ae3f75bf34a60.tar.gz scummvm-rg350-b31d6212ffc35b987cfb7ee35a5ae3f75bf34a60.tar.bz2 scummvm-rg350-b31d6212ffc35b987cfb7ee35a5ae3f75bf34a60.zip |
WINTERMUTE: Privatize variables in BaseFrame and BaseSprite
Diffstat (limited to 'engines/wintermute/ad/ad_entity.cpp')
-rw-r--r-- | engines/wintermute/ad/ad_entity.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp index 00dbc0f3c2..f97284ae1d 100644 --- a/engines/wintermute/ad/ad_entity.cpp +++ b/engines/wintermute/ad/ad_entity.cpp @@ -578,7 +578,7 @@ bool AdEntity::update() { } // finished playing animation? - if (_state == STATE_PLAYING_ANIM && _animSprite != NULL && _animSprite->_finished) { + if (_state == STATE_PLAYING_ANIM && _animSprite != NULL && _animSprite->isFinished()) { _state = STATE_READY; _currentSprite = _animSprite; } @@ -613,7 +613,7 @@ bool AdEntity::update() { } bool timeIsUp = (_sentence->_sound && _sentence->_soundStarted && (!_sentence->_sound->isPlaying() && !_sentence->_sound->isPaused())) || (!_sentence->_sound && _sentence->_duration <= _gameRef->_timer - _sentence->_startTime); - if (_tempSprite2 == NULL || _tempSprite2->_finished || (/*_tempSprite2->_looping &&*/ timeIsUp)) { + if (_tempSprite2 == NULL || _tempSprite2->isFinished() || (/*_tempSprite2->_looping &&*/ timeIsUp)) { if (timeIsUp) { _sentence->finish(); _tempSprite2 = NULL; @@ -639,7 +639,7 @@ bool AdEntity::update() { if (_currentSprite) { _currentSprite->getCurrentFrame(_zoomable ? ((AdGame *)_gameRef)->_scene->getZoomAt(_posX, _posY) : 100); - if (_currentSprite->_changed) { + if (_currentSprite->isChanged()) { _posX += _currentSprite->_moveX; _posY += _currentSprite->_moveY; } |