sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- rename lastPlayersTurn -> previousPlayerID and lastActionPlayer -> lastActionPlayerID

Browse Source
This commit is contained in:
floty
2011-10-26 19:34:57 +00:00
parent c867a789d3
commit f1dc2e90a5
15 changed files with 119 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+4 -4
View File
@@ -1753,7 +1753,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
netActionDone->totalPlayerBet - tmpPlayer->getMySet());
}
// Update last players turn only after the blinds.
curGame->getCurrentHand()->setLastPlayersTurn(tmpPlayer->getMyID());
curGame->getCurrentHand()->setPreviousPlayerID(tmpPlayer->getMyID());
}
tmpPlayer->setMyAction(PlayerAction(netActionDone->playerAction));
@@ -1832,7 +1832,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
tmpCards[3] = tmpCards[4] = 0;
curGame->getCurrentHand()->getBoard()->setMyCards(tmpCards);
curGame->getCurrentHand()->getBoard()->collectPot();
curGame->getCurrentHand()->setLastPlayersTurn(-1);
curGame->getCurrentHand()->setPreviousPlayerID(-1);
client->GetGui().logDealBoardCardsMsg(GAME_STATE_FLOP, tmpCards[0], tmpCards[1], tmpCards[2], tmpCards[3], tmpCards[4]);
client->GetGui().refreshGameLabels(GAME_STATE_FLOP);
@@ -1847,7 +1847,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
tmpCards[3] = static_cast<int>(netDealTurn->turnCard);
curGame->getCurrentHand()->getBoard()->setMyCards(tmpCards);
curGame->getCurrentHand()->getBoard()->collectPot();
curGame->getCurrentHand()->setLastPlayersTurn(-1);
curGame->getCurrentHand()->setPreviousPlayerID(-1);
client->GetGui().logDealBoardCardsMsg(GAME_STATE_TURN, tmpCards[0], tmpCards[1], tmpCards[2], tmpCards[3], tmpCards[4]);
client->GetGui().refreshGameLabels(GAME_STATE_TURN);
@@ -1862,7 +1862,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
tmpCards[4] = static_cast<int>(netDealRiver->riverCard);
curGame->getCurrentHand()->getBoard()->setMyCards(tmpCards);
curGame->getCurrentHand()->getBoard()->collectPot();
curGame->getCurrentHand()->setLastPlayersTurn(-1);
curGame->getCurrentHand()->setPreviousPlayerID(-1);
client->GetGui().logDealBoardCardsMsg(GAME_STATE_RIVER, tmpCards[0], tmpCards[1], tmpCards[2], tmpCards[3], tmpCards[4]);
client->GetGui().refreshGameLabels(GAME_STATE_RIVER);
src/net/common/servergamestate.cpp
+3 -3
View File
@@ -154,12 +154,12 @@ static void PerformPlayerAction(ServerGame &server, boost::shared_ptr<PlayerInte
switch(action) {
case PLAYER_ACTION_BET: {
curGame.getCurrentHand()->getCurrentBeRo()->setMinimumRaise(bet);
curGame.getCurrentHand()->setLastActionPlayer(player->getMyUniqueID());
curGame.getCurrentHand()->setLastActionPlayerID(player->getMyUniqueID());
}
break;
case PLAYER_ACTION_RAISE: {
curGame.getCurrentHand()->getCurrentBeRo()->setMinimumRaise(player->getMySet() - curGame.getCurrentHand()->getCurrentBeRo()->getHighestSet());
curGame.getCurrentHand()->setLastActionPlayer(player->getMyUniqueID());
curGame.getCurrentHand()->setLastActionPlayerID(player->getMyUniqueID());
}
break;
case PLAYER_ACTION_ALLIN: {
@@ -167,7 +167,7 @@ static void PerformPlayerAction(ServerGame &server, boost::shared_ptr<PlayerInte
curGame.getCurrentHand()->getCurrentBeRo()->setMinimumRaise(player->getMySet() - curGame.getCurrentHand()->getCurrentBeRo()->getHighestSet());
}
if(player->getMySet() - curGame.getCurrentHand()->getCurrentBeRo()->getHighestSet() > 0) {
curGame.getCurrentHand()->setLastActionPlayer(player->getMyUniqueID());
curGame.getCurrentHand()->setLastActionPlayerID(player->getMyUniqueID());
}
}
break;