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

[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:
fe6fae490e TSAGE: R2R - Fix a bug in handlePlayer1, some renaming


Commit: fe6fae490e7c7a075e391db1671c8cc11584ea0a
    https://github.com/scummvm/scummvm/commit/fe6fae490e7c7a075e391db1671c8cc11584ea0a
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-01T20:06:49+02:00

Commit Message:
TSAGE: R2R - Fix a bug in handlePlayer1, some renaming

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 1490bb4..77a4afc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5938,10 +5938,10 @@ void Scene1337::handlePlayer1() {
 	}
 
 	int card13Id = findCard13InHand(1);
-	int tmpVal2 = getPlayerWithOutpost(1);
+	int victimId = getPlayerWithOutpost(1);
 
-	if ((card13Id != -1) && (tmpVal2 != -1)) {
-		playCounterTrickCard(&_gameBoardSide[1]._handCard[card13Id], tmpVal2);
+	if ((card13Id != -1) && (victimId != -1)) {
+		playCounterTrickCard(&_gameBoardSide[1]._handCard[card13Id], victimId);
 		return;
 	}
 
@@ -5954,7 +5954,7 @@ void Scene1337::handlePlayer1() {
 				if (  (_gameBoardSide[rndVal]._handCard[0]._cardId != 0)
 					|| (_gameBoardSide[rndVal]._handCard[1]._cardId != 0)
 					|| (_gameBoardSide[rndVal]._handCard[2]._cardId != 0)
-					|| (_gameBoardSide[rndVal]._handCard[3]._cardId == 0)) {
+					|| (_gameBoardSide[rndVal]._handCard[3]._cardId != 0)) {
 						playerIdFound = rndVal;
 						break;
 				}
@@ -6052,7 +6052,6 @@ void Scene1337::handlePlayer3() {
 	}
 
 	int randIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
-
 	if (_gameBoardSide[3]._handCard[randIndx]._cardId == 1) {
 		for (int i = 0; i <= 7; i++) {
 			if ((_gameBoardSide[3]._outpostStation[i]._cardId == 0) && !isStopConstructionCard(_gameBoardSide[3]._delayCard._cardId)) {