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

applying astyle

Browse Source
This commit is contained in:
floty
2011-10-26 22:29:47 +00:00
parent fa01ab57d6
commit 7f13da91e5
38 changed files with 443 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+6 -6
View File
@@ -1756,10 +1756,10 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
netActionDone->totalPlayerBet - tmpPlayer->getMySet());
}
// Update last players turn only after the blinds.
curGame->getCurrentHand()->setPreviousPlayerID(tmpPlayer->getMyID());
curGame->getCurrentHand()->setPreviousPlayerID(tmpPlayer->getMyID());
}
tmpPlayer->setMyAction(PlayerAction(netActionDone->playerAction));
tmpPlayer->setMyAction(PlayerAction(netActionDone->playerAction));
tmpPlayer->setMySetAbsolute(netActionDone->totalPlayerBet);
tmpPlayer->setMyCash(netActionDone->playerMoney);
curGame->getCurrentHand()->getCurrentBeRo()->setHighestSet(netActionDone->highestSet);
@@ -1835,7 +1835,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
tmpCards[3] = tmpCards[4] = 0;
curGame->getCurrentHand()->getBoard()->setMyCards(tmpCards);
curGame->getCurrentHand()->getBoard()->collectPot();
curGame->getCurrentHand()->setPreviousPlayerID(-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);
@@ -1850,7 +1850,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()->setPreviousPlayerID(-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);
@@ -1865,7 +1865,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()->setPreviousPlayerID(-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);
@@ -1995,7 +1995,7 @@ ClientStateRunHand::ResetPlayerActions(Game &curGame)
while (i != end) {
int action = (*i)->getMyAction();
if (action != 1 && action != 6)
(*i)->setMyAction(PLAYER_ACTION_NONE);
(*i)->setMyAction(PLAYER_ACTION_NONE);
(*i)->setMySetNull();
++i;
}
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()->setLastActionPlayerID(player->getMyUniqueID());
curGame.getCurrentHand()->setLastActionPlayerID(player->getMyUniqueID());
}
break;
case PLAYER_ACTION_RAISE: {
curGame.getCurrentHand()->getCurrentBeRo()->setMinimumRaise(player->getMySet() - curGame.getCurrentHand()->getCurrentBeRo()->getHighestSet());
curGame.getCurrentHand()->setLastActionPlayerID(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()->setLastActionPlayerID(player->getMyUniqueID());
curGame.getCurrentHand()->setLastActionPlayerID(player->getMyUniqueID());
}
}
break;
src/net/common/serverlobbythread.cpp
+1 -1
View File
@@ -905,7 +905,7 @@ ServerLobbyThread::HandlePacket(boost::shared_ptr<SessionData> session, boost::s
else if (packet->GetMsg()->present == PokerTHMessage_PR_avatarRequestMessage)
HandleNetPacketRetrieveAvatar(session, packet->GetMsg()->choice.avatarRequestMessage);
else if (packet->GetMsg()->present == PokerTHMessage_PR_resetTimeoutMessage)
{}
{}
else if (packet->GetMsg()->present == PokerTHMessage_PR_subscriptionRequestMessage) {
SubscriptionRequestMessage_t *subscriptionRequest = &packet->GetMsg()->choice.subscriptionRequestMessage;
if (subscriptionRequest->subscriptionAction == subscriptionAction_resubscribeGameList)