libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: R2R - Reduce the scope of a variable, some renaming

Browse Source
This commit is contained in:
Strangerke 2014-09-29 23:57:51 +02:00
parent 6eb3dc0719
commit e37a92fc7b
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/tsage/ringworld2/ringworld2_scenes1.cpp
View File

@ -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--;