GNAP: Some renaming

4 files changed, 19 insertions, 21 deletions

diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index e6a789a7b7..ce81f368b8 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -2194,12 +2194,12 @@ int GnapEngine::scene00_init() {
 	return 0x37C;
 }
 
-void GnapEngine::toyUfoSetStatus(int a1) {
+void GnapEngine::toyUfoSetStatus(int flagNum) {
 	clearFlag(16);
 	clearFlag(17);
 	clearFlag(18);
 	clearFlag(19);
-	setFlag(a1);
+	setFlag(flagNum);
 }
 
 int GnapEngine::toyUfoGetSequenceId() {
diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h
index c05706dffb..44d6e2e355 100644
--- a/engines/gnap/gnap.h
+++ b/engines/gnap/gnap.h
@@ -841,7 +841,7 @@ public:
 	void scene40_updateAnimations();
 
 	// Scene 4x
-	void toyUfoSetStatus(int a1);
+	void toyUfoSetStatus(int flagNum);
 	int toyUfoGetSequenceId();
 	bool toyUfoCheckTimer();
 	void toyUfoFlyTo(int destX, int destY, int minX, int maxX, int minY, int maxY, int animationIndex);
@@ -917,7 +917,7 @@ public:
 	int scene49_init();
 	void scene49_updateHotspots();
 	void scene49_checkObstacles();
-	void scene49_updateObstacle(int i);
+	void scene49_updateObstacle(int id);
 	void scene49_increaseScore(int amount);
 	void scene49_decreaseScore(int amount);
 	void scene49_refreshScoreBar();
@@ -1057,7 +1057,7 @@ public:
 	int scene52_shipCannonHitShield(int cannonNum);
 	int scene52_shipCannonHitAlien();
 	void scene52_shipExplode();
-	int scene52_checkAlienRow(int a1);
+	int scene52_checkAlienRow(int rowNum);
 	void scene52_updateAlienRowXOfs();
 	void scene52_initAlienSize();
 	void scene52_playSound();
@@ -1066,7 +1066,7 @@ public:
 	void scene52_loseShip();
 	void scene52_initShields();
 	void scene52_initAnims();
-	void scene52_drawScore(int a1);
+	void scene52_drawScore(int score);
 	void scene52_run();
 	
 	// Scene 53
diff --git a/engines/gnap/scenes/scene49.cpp b/engines/gnap/scenes/scene49.cpp
index e3683bebb9..19da920bf2 100644
--- a/engines/gnap/scenes/scene49.cpp
+++ b/engines/gnap/scenes/scene49.cpp
@@ -140,9 +140,9 @@ void GnapEngine::scene49_checkObstacles() {
 
 }
 
-void GnapEngine::scene49_updateObstacle(int i) {
+void GnapEngine::scene49_updateObstacle(int id) {
 
-	Scene49Obstacle &obstacle = _s49_obstacles[i];
+	Scene49Obstacle &obstacle = _s49_obstacles[id];
 	
 	obstacle.currId = obstacle.prevId;
 	
@@ -167,7 +167,7 @@ void GnapEngine::scene49_updateObstacle(int i) {
 	if (obstacle.currSequenceId == obstacle.closerSequenceId) {
 		if (_s49_truckLaneNum == obstacle.laneNum) {
 			if (obstacle.splashSequenceId) {
-				_gameSys->setAnimation(obstacle.collisionSequenceId, obstacle.prevId, i + 2);
+				_gameSys->setAnimation(obstacle.collisionSequenceId, obstacle.prevId, id + 2);
 				_gameSys->insertSequence(obstacle.collisionSequenceId, obstacle.prevId,
 					obstacle.currSequenceId, obstacle.currId,
 					kSeqSyncWait, 0, 0, -50);
@@ -177,14 +177,14 @@ void GnapEngine::scene49_updateObstacle(int i) {
 			} else if ((obstacle.laneNum == 1 && _s49_truckSequenceId == 0xB0) ||
 				(obstacle.laneNum == 2 && (_s49_truckSequenceId == 0xB1 || _s49_truckSequenceId == 0xB2)) ||
 				(obstacle.laneNum == 3 && _s49_truckSequenceId == 0xB3)) {
-				_gameSys->setAnimation(obstacle.passedSequenceId, obstacle.prevId, i + 2);
+				_gameSys->setAnimation(obstacle.passedSequenceId, obstacle.prevId, id + 2);
 				_gameSys->insertSequence(obstacle.passedSequenceId, obstacle.prevId,
 					obstacle.currSequenceId, obstacle.currId,
 					kSeqSyncWait, 0, 0, -50);
 				obstacle.currSequenceId = obstacle.passedSequenceId;
 			} else {
 				_gameSys->setAnimation(obstacle.collisionSequenceId, 256, 0);
-				_gameSys->setAnimation(obstacle.passedSequenceId, obstacle.prevId, i + 2);
+				_gameSys->setAnimation(obstacle.passedSequenceId, obstacle.prevId, id + 2);
 				_gameSys->insertSequence(obstacle.passedSequenceId, obstacle.prevId,
 					obstacle.currSequenceId, obstacle.currId,
 					kSeqSyncWait, 0, 0, -50);
@@ -198,7 +198,7 @@ void GnapEngine::scene49_updateObstacle(int i) {
 				scene49_decreaseScore(30);
 			}
 		} else {
-			_gameSys->setAnimation(obstacle.passedSequenceId, obstacle.prevId, i + 2);
+			_gameSys->setAnimation(obstacle.passedSequenceId, obstacle.prevId, id + 2);
 			_gameSys->insertSequence(obstacle.passedSequenceId, obstacle.prevId,
 				obstacle.currSequenceId, obstacle.currId,
 				kSeqSyncWait, 0, 0, -50);
@@ -207,7 +207,7 @@ void GnapEngine::scene49_updateObstacle(int i) {
 	} else if (obstacle.currSequenceId == obstacle.passedSequenceId) {
 		if (_s49_truckLaneNum == obstacle.laneNum) {
 			if (obstacle.splashSequenceId) {
-				_gameSys->setAnimation(obstacle.collisionSequenceId, obstacle.prevId, i + 2);
+				_gameSys->setAnimation(obstacle.collisionSequenceId, obstacle.prevId, id + 2);
 				_gameSys->insertSequence(obstacle.collisionSequenceId, obstacle.prevId,
 					obstacle.currSequenceId, obstacle.currId,
 					kSeqSyncWait, 0, 0, -50);
@@ -216,15 +216,15 @@ void GnapEngine::scene49_updateObstacle(int i) {
 				scene49_increaseScore(30);
 			}
 		} else if (obstacle.splashSequenceId) {
-			_gameSys->setAnimation(obstacle.splashSequenceId, obstacle.prevId, i + 2);
+			_gameSys->setAnimation(obstacle.splashSequenceId, obstacle.prevId, id + 2);
 			_gameSys->insertSequence(obstacle.splashSequenceId, obstacle.prevId,
 				obstacle.currSequenceId, obstacle.currId,
 				kSeqSyncWait, 0, 0, -50);
 			obstacle.currSequenceId = obstacle.splashSequenceId;
 		}
 	} else {
-		_gameSys->setAnimation(0, 0, i + 2);
-		scene49_clearObstacle(i);
+		_gameSys->setAnimation(0, 0, id + 2);
+		scene49_clearObstacle(id);
 	}
 	
 }
diff --git a/engines/gnap/scenes/scene52.cpp b/engines/gnap/scenes/scene52.cpp
index 02718ec467..369668555d 100644
--- a/engines/gnap/scenes/scene52.cpp
+++ b/engines/gnap/scenes/scene52.cpp
@@ -647,13 +647,11 @@ void GnapEngine::scene52_shipExplode() {
 }
 
 int GnapEngine::scene52_checkAlienRow(int rowNum) {
-
-	int v4 = 0;
-
 	for (int i = 0; i < 5; ++i)
 		if (_s52_items[rowNum][i] >= 0)
 			return 0;
 
+	int v4 = 0;
 	for (int j = 0; j < 5; ++j)
 		if (_s52_items[rowNum][j] == -2) {
 			_gameSys->removeSequence(_s52_alienRowKind[rowNum], j + 256, true);
@@ -785,9 +783,9 @@ void GnapEngine::scene52_initAnims() {
 		_gameSys->setAnimation(0, 0, k + 9);
 }
 
-void GnapEngine::scene52_drawScore(int a1) {
+void GnapEngine::scene52_drawScore(int score) {
 	char str[4];
-	sprintf(str, "%03d", a1);
+	sprintf(str, "%03d", score);
 	_gameSys->fillSurface(0, 420, 80, 48, 30, 0, 0, 0);
 	_gameSys->drawTextToSurface(0, 420, 80, 255, 255, 255, str);
 }