diff options
| author | Strangerke | 2014-05-26 22:13:19 +0200 |
|---|---|---|
| committer | Strangerke | 2014-05-26 22:14:51 +0200 |
| commit | b035333dfd67a4d14b6ae73d3bd293a751e5df97 (patch) | |
| tree | a28e6ef5d2bf6e43dc144852056df45a49760966 /engines | |
| parent | c20fabb98082fe9237504b80e4f4049bd0fc687c (diff) | |
| download | scummvm-rg350-b035333dfd67a4d14b6ae73d3bd293a751e5df97.tar.gz scummvm-rg350-b035333dfd67a4d14b6ae73d3bd293a751e5df97.tar.bz2 scummvm-rg350-b035333dfd67a4d14b6ae73d3bd293a751e5df97.zip | |
MADS: Remove dead code in scene 608, some rework
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mads/nebular/nebular_scenes6.cpp | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp index feb2725b1f..8101428aab 100644 --- a/engines/mads/nebular/nebular_scenes6.cpp +++ b/engines/mads/nebular/nebular_scenes6.cpp @@ -1925,72 +1925,46 @@ void Scene608::step() { if ((_carMode == 4) && (_scene->_activeAnimation != nullptr)) { if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) { _carFrame = _scene->_activeAnimation->getCurrentFrame(); - int nextFrame = -1; if (_carFrame == 10) { _game._player._visible = true; _game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount; - } - - if (_carFrame == 56) { + } else if (_carFrame == 56) { resetDogVariables(); _animationMode = 0; _nextTrigger = 2; } - - if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) { - _scene->_activeAnimation->setCurrentFrame(nextFrame); - _carFrame = nextFrame; - } } } if ((_carMode == 5) && (_scene->_activeAnimation != nullptr)) { if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) { _carFrame = _scene->_activeAnimation->getCurrentFrame(); - int nextFrame = -1; - if (_carFrame == 10) { _game._player._visible = true; _game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount; - } - - if (_carFrame == 52) { + } else if (_carFrame == 52) { resetDogVariables(); _animationMode = 0; _nextTrigger = 2; } - - if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) { - _scene->_activeAnimation->setCurrentFrame(nextFrame); - _carFrame = nextFrame; - } } } - if ((_carMode == 6) && (_scene->_activeAnimation != nullptr)) { if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) { _carFrame = _scene->_activeAnimation->getCurrentFrame(); - int nextFrame = -1; if (_carFrame == 11) { _game._player._visible = true; _game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount; - } - - if (_carFrame == 41) { + } else if (_carFrame == 41) { _globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], false, 9, 0, 0, 0); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 10, 11); _scene->_sequences.setDepth(_globals._sequenceIndexes[10], 6); _dogUnderCar = true; _nextTrigger = 2; } - - if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) { - _scene->_activeAnimation->setCurrentFrame(nextFrame); - _carFrame = nextFrame; - } } } |