diff options
| author | Strangerke | 2014-10-01 20:06:49 +0200 |
|---|---|---|
| committer | Strangerke | 2014-10-01 20:06:49 +0200 |
| commit | fe6fae490e7c7a075e391db1671c8cc11584ea0a (patch) | |
| tree | fc7635bc35dd3ea1b7588ffd674d6a24f24a7cc5 /engines | |
| parent | 3bba85278903f50e92d068c895b1fc829bf8f212 (diff) | |
| download | scummvm-rg350-fe6fae490e7c7a075e391db1671c8cc11584ea0a.tar.gz scummvm-rg350-fe6fae490e7c7a075e391db1671c8cc11584ea0a.tar.bz2 scummvm-rg350-fe6fae490e7c7a075e391db1671c8cc11584ea0a.zip | |
TSAGE: R2R - Fix a bug in handlePlayer1, some renaming
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 1490bb47c1..77a4afca31 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)) { |