From e37a92fc7bbe990f59cb86a61217268bba18a3d4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 29 Sep 2014 23:57:51 +0200
Subject: TSAGE: R2R - Reduce the scope of a variable, some renaming

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'engines/tsage')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index bd5cddfe94..1490bb47c1 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5972,20 +5972,20 @@ void Scene1337::handlePlayer1() {
 		}
 	}
 
-	int count = -1;
 	for (int i = 0; i <= 3; i++) {
 		int tmpVal = isDelayCard(_gameBoardSide[1]._handCard[i]._cardId);
 		if (tmpVal != -1) {
+			int victimId = -1;
 			int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3);
 
 			for (int j = 0; j <= 3; j++) {
 				if (rndVal != 1) {
 					if ((_gameBoardSide[rndVal]._delayCard._cardId == 0) && isAttackPossible(rndVal, _gameBoardSide[1]._handCard[i]._cardId))
-						count = rndVal;
+						victimId = rndVal;
 				}
 
-				if (count != -1) {
-					playDelayCard(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[count]._delayCard);
+				if (victimId != -1) {
+					playDelayCard(&_gameBoardSide[1]._handCard[i], &_gameBoardSide[victimId]._delayCard);
 					return;
 				} else {
 					rndVal--;
@@ -5996,18 +5996,17 @@ void Scene1337::handlePlayer1() {
 		}
 	}
 
-	int j;
-	for (j = 0; j <= 3; j++) {
+	for (int j = 0; j <= 3; j++) {
 		if (getStationCardId(_gameBoardSide[1]._handCard[j]._cardId) != -1) {
-			count = -1;
+			int victimId = -1;
 			int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3);
 			for (int l = 0; l <= 3; l++) {
 				if (rndVal != 1) {
 					if ((_gameBoardSide[rndVal]._delayCard._cardId == 0) && (_gameBoardSide[1]._handCard[j]._cardId == 1))
-						count = rndVal;
+						victimId = rndVal;
 				}
-				if (count != -1) {
-					playDelayCard(&_gameBoardSide[1]._handCard[j], &_gameBoardSide[count]._delayCard);
+				if (victimId != -1) {
+					playDelayCard(&_gameBoardSide[1]._handCard[j], &_gameBoardSide[victimId]._delayCard);
 					return;
 				} else {
 					rndVal--;
-- 
cgit v1.2.3