diff options
| author | Strangerke | 2016-05-24 22:26:15 +0200 |
|---|---|---|
| committer | Strangerke | 2016-05-24 22:26:15 +0200 |
| commit | be6f7c0f83494b5fac30a9df7fb379ed431cadc2 (patch) | |
| tree | 8641084a62622ba75d9946a5b6686b7eae1fcc91 /engines/gnap/scenes/arcade.cpp | |
| parent | 511b37bcb0bc086712138da25cbbefd6dab272be (diff) | |
| download | scummvm-rg350-be6f7c0f83494b5fac30a9df7fb379ed431cadc2.tar.gz scummvm-rg350-be6f7c0f83494b5fac30a9df7fb379ed431cadc2.tar.bz2 scummvm-rg350-be6f7c0f83494b5fac30a9df7fb379ed431cadc2.zip | |
GNAP: Remove duplicate code. Renaming and cleanup.
Diffstat (limited to 'engines/gnap/scenes/arcade.cpp')
| -rw-r--r-- | engines/gnap/scenes/arcade.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp index 2966c3ec05..cd2a057874 100644 --- a/engines/gnap/scenes/arcade.cpp +++ b/engines/gnap/scenes/arcade.cpp @@ -1945,15 +1945,9 @@ void Scene52::update() { } } - if (_vm->_timers[1] || getFreeShipCannon() == -1) { - _nextUfoSequenceId = 34; - if (_ufoSequenceId != 34) - _shipFlag = true; - } else { - _nextUfoSequenceId = 34; - if (_ufoSequenceId != 34) - _shipFlag = true; - } + _nextUfoSequenceId = 34; + if (_ufoSequenceId != 34) + _shipFlag = true; if (_shipFlag) { if (_vm->_gameSys->getAnimationStatus(7) == 2) { @@ -1966,13 +1960,8 @@ void Scene52::update() { if (_alienWave && !_vm->_timers[0]) { playSound(); - int v0 = _alienSpeed; - if (_alienSpeed >= 10) - v0 = 10; - int v1 = v0; - if (v0 < 2) - v1 = 2; - _vm->_timers[0] = v1; + int delay = CLIP(_alienSpeed, 2, 10); + _vm->_timers[0] = delay; } } |