[Scummvm-cvs-logs] scummvm master -> be6f7c0f83494b5fac30a9df7fb379ed431cadc2

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
be6f7c0f83 GNAP: Remove duplicate code. Renaming and cleanup.


Commit: be6f7c0f83494b5fac30a9df7fb379ed431cadc2
    https://github.com/scummvm/scummvm/commit/be6f7c0f83494b5fac30a9df7fb379ed431cadc2
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-24T22:26:15+02:00

Commit Message:
GNAP: Remove duplicate code. Renaming and cleanup.

Changed paths:
    engines/gnap/scenes/arcade.cpp



diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp
index 2966c3e..cd2a057 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;
 	}
 }