diff options
| author | Einar Johan Trøan Sømåen | 2012-07-26 22:20:55 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-26 22:20:55 +0200 |
| commit | 3a49f2bad407787ef65d04c5f9ae423485629b41 (patch) | |
| tree | f7ceed0ac885724b5569302bc23ba3f027705fb1 /engines/wintermute/ad/ad_entity.cpp | |
| parent | 496a3938c451683845e73fa9b2cba20dadddfe21 (diff) | |
| download | scummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.tar.gz scummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.tar.bz2 scummvm-rg350-3a49f2bad407787ef65d04c5f9ae423485629b41.zip | |
WINTERMUTE: More variable/function renaming VarName->varName
Diffstat (limited to 'engines/wintermute/ad/ad_entity.cpp')
| -rw-r--r-- | engines/wintermute/ad/ad_entity.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp index aa30a0096c..daa064f328 100644 --- a/engines/wintermute/ad/ad_entity.cpp +++ b/engines/wintermute/ad/ad_entity.cpp @@ -611,9 +611,9 @@ 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);
- if (_tempSprite2 == NULL || _tempSprite2->_finished || (/*_tempSprite2->_looping &&*/ TimeIsUp)) {
- if (TimeIsUp) {
+ 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 (timeIsUp) {
_sentence->finish();
_tempSprite2 = NULL;
_state = STATE_READY;
@@ -637,7 +637,7 @@ bool AdEntity::update() { if (_currentSprite) {
- _currentSprite->GetCurrentFrame(_zoomable ? ((AdGame *)_gameRef)->_scene->getZoomAt(_posX, _posY) : 100);
+ _currentSprite->getCurrentFrame(_zoomable ? ((AdGame *)_gameRef)->_scene->getZoomAt(_posX, _posY) : 100);
if (_currentSprite->_changed) {
_posX += _currentSprite->_moveX;
_posY += _currentSprite->_moveY;
@@ -648,10 +648,10 @@ bool AdEntity::update() { _ready = (_state == STATE_READY);
if (_theora) {
- int OffsetX, OffsetY;
- _gameRef->getOffset(&OffsetX, &OffsetY);
- _theora->_posX = _posX - OffsetX;
- _theora->_posY = _posY - OffsetY;
+ int offsetX, offsetY;
+ _gameRef->getOffset(&offsetX, &offsetY);
+ _theora->_posX = _posX - offsetX;
+ _theora->_posY = _posY - offsetY;
_theora->update();
if (_theora->isFinished()) {
|