diff options
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 37 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.h | 4 |
2 files changed, 18 insertions, 23 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index cfba50e7f9..ec17ab5584 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -4690,8 +4690,8 @@ bool Scene1337::subC264B(int cardId) { } } -bool Scene1337::subC2687(int arg1) { - switch (arg1) { +bool Scene1337::subC2687(int cardId) { + switch (cardId) { case 11: // No break on purpose case 14: @@ -4705,10 +4705,9 @@ bool Scene1337::subC2687(int arg1) { } } -int Scene1337::subC26CB(int arg1, int arg2) { - if ((_gameBoardSide[arg1]._handCard[arg2]._cardId > 1) && (_gameBoardSide[arg1]._handCard[arg2]._cardId <= 9)) { - return arg2; - } +int Scene1337::subC26CB(int playerId, int handCardId) { + if ((_gameBoardSide[playerId]._handCard[handCardId]._cardId > 1) && (_gameBoardSide[playerId]._handCard[handCardId]._cardId <= 9)) + return handCardId; return -1; } @@ -5384,8 +5383,6 @@ void Scene1337::subPostInit() { _autoplay = false; _instructionsDisplayedFl = false; _instructionsWaitCount = 0; - - actionDisplay(1330, 114, 159, 10, 1, 200, 0, 7, 0, 154, 154); } void Scene1337::suggestInstructions() { @@ -6086,21 +6083,19 @@ void Scene1337::handlePlayer1() { break; for (int j = 0; j <= 7; j++) { - if (_gameBoardSide[1]._outpostStation[j]._cardId == 1) { - if (!subC2687(_gameBoardSide[1]._delayCard._cardId)) { - count = 0; - for (int k = 0; k <= 7; k++) { - if ((_gameBoardSide[1]._outpostStation[k]._cardId > 1) && (_gameBoardSide[1]._outpostStation[k]._cardId <= 9)) - ++count; - } + if ((_gameBoardSide[1]._outpostStation[j]._cardId == 1) && !subC2687(_gameBoardSide[1]._delayCard._cardId)) { + count = 0; + for (int k = 0; k <= 7; k++) { + if ((_gameBoardSide[1]._outpostStation[k]._cardId > 1) && (_gameBoardSide[1]._outpostStation[k]._cardId <= 9)) + ++count; + } - if (count == 7) - _winnerId = 1; + if (count == 7) + _winnerId = 1; - subC33C0(&_gameBoardSide[1]._handCard[tmpIndx], &_gameBoardSide[1]._outpostStation[j]); - found = true; - break; - } + subC33C0(&_gameBoardSide[1]._handCard[tmpIndx], &_gameBoardSide[1]._outpostStation[j]); + found = true; + break; } } } diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h index de0f3c9af4..bd0b1ec06d 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.h +++ b/engines/tsage/ringworld2/ringworld2_scenes1.h @@ -334,8 +334,8 @@ public: void handleNextTurn(); void subC2586(); bool subC264B(int cardId); - bool subC2687(int arg1); - int subC26CB(int arg1, int arg2); + bool subC2687(int cardId); + int subC26CB(int playerId, int handCardId); int findNormalCardInHand(int playerId); int subC274D(int arg1); int subC2781(int arg1); |