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

changing parameter in some log-functions; run astyle

Browse Source
This commit is contained in:
floty
2012-01-07 18:42:24 +00:00
parent 476ee936f0
commit 800199f6f0
12 changed files with 182 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+6 -8
View File
@@ -1710,7 +1710,7 @@ ClientStateWaitHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client
tmpPlayer->setLastMoneyWon(r->moneyWon);
client->GetCallback().SignalNetClientPostRiverShowCards(r->playerId);
client->GetClientLog()->logHoleCardsHandName(GAME_STATE_POST_RIVER, client->GetGame()->getActivePlayerList(), tmpPlayer, true);
client->GetClientLog()->logHoleCardsHandName(client->GetGame()->getActivePlayerList(), tmpPlayer, true);
} else if (tmpPacket->GetMsg()->present == PokerTHMessage_PR_playerIdChangedMessage) {
boost::shared_ptr<Game> curGame = client->GetGame();
if (curGame) {
@@ -1788,8 +1788,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
netActionDone->playerAction,
netActionDone->totalPlayerBet - tmpPlayer->getMySet());
client->GetClientLog()->logPlayerAction(
curGame->getCurrentHand()->getCurrentBeRo()->getMyBeRoID(),
tmpPlayer->getMyID()+1,
tmpPlayer->getMyName(),
client->GetClientLog()->transformPlayerActionLog(PlayerAction(netActionDone->playerAction)),
netActionDone->totalPlayerBet - tmpPlayer->getMySet()
);
@@ -1886,7 +1885,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
curGame->getCurrentHand()->setPreviousPlayerID(-1);
client->GetGui().logDealBoardCardsMsg(GAME_STATE_FLOP, tmpCards[0], tmpCards[1], tmpCards[2], tmpCards[3], tmpCards[4]);
client->GetClientLog()->logBoardCards(GAME_STATE_FLOP,tmpCards);
client->GetClientLog()->logBoardCards(tmpCards);
client->GetGui().refreshGameLabels(GAME_STATE_FLOP);
client->GetGui().refreshPot();
client->GetGui().refreshSet();
@@ -1902,7 +1901,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
curGame->getCurrentHand()->setPreviousPlayerID(-1);
client->GetGui().logDealBoardCardsMsg(GAME_STATE_TURN, tmpCards[0], tmpCards[1], tmpCards[2], tmpCards[3], tmpCards[4]);
client->GetClientLog()->logBoardCards(GAME_STATE_TURN,tmpCards);
client->GetClientLog()->logBoardCards(tmpCards);
client->GetGui().refreshGameLabels(GAME_STATE_TURN);
client->GetGui().refreshPot();
client->GetGui().refreshSet();
@@ -1918,7 +1917,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
curGame->getCurrentHand()->setPreviousPlayerID(-1);
client->GetGui().logDealBoardCardsMsg(GAME_STATE_RIVER, tmpCards[0], tmpCards[1], tmpCards[2], tmpCards[3], tmpCards[4]);
client->GetClientLog()->logBoardCards(GAME_STATE_RIVER,tmpCards);
client->GetClientLog()->logBoardCards(tmpCards);
client->GetGui().refreshGameLabels(GAME_STATE_RIVER);
client->GetGui().refreshPot();
client->GetGui().refreshSet();
@@ -1947,7 +1946,6 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
client->GetGui().flipHolecardsAllIn();
if(curGame->getCurrentHand()->getCurrentRound()<GAME_STATE_RIVER) {
client->GetClientLog()->logHoleCardsHandName(
curGame->getCurrentHand()->getCurrentRound(),
curGame->getActivePlayerList()
);
}
@@ -2037,7 +2035,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
curGame->getCurrentHand()->getBoard()->setPlayerNeedToShowCards(showList);
// logging
client->GetClientLog()->logHoleCardsHandName(GAME_STATE_POST_RIVER,curGame->getActivePlayerList());
client->GetClientLog()->logHoleCardsHandName(curGame->getActivePlayerList());
client->GetClientLog()->logHandWinner(curGame->getActivePlayerList(), highestValueOfCards, winnerList);
client->GetGui().postRiverRunAnimation1();
src/net/common/clientthread.cpp
+3 -6
View File
@@ -753,8 +753,7 @@ ClientThread::SetNewGameAdmin(unsigned id)
playerData->SetGameAdmin(true);
GetCallback().SignalNetClientNewGameAdmin(id, playerData->GetName());
m_clientLog->logPlayerAction(
m_game->getCurrentHand()->getCurrentRound(),
m_game->getPlayerByUniqueId(id)->getMyID()+1,
playerData->GetName(),
LOG_ACTION_ADMIN
);
}
@@ -1126,14 +1125,12 @@ ClientThread::RemovePlayerData(unsigned playerId, int removeReason)
if(removeReason == NTF_NET_REMOVED_KICKED) {
m_clientLog->logPlayerAction(
m_game->getCurrentHand()->getCurrentRound(),
m_game->getPlayerByUniqueId(tmpData->GetUniqueId())->getMyID()+1,
tmpData->GetName(),
LOG_ACTION_KICKED
);
} else {
m_clientLog->logPlayerAction(
m_game->getCurrentHand()->getCurrentRound(),
m_game->getPlayerByUniqueId(tmpData->GetUniqueId())->getMyID()+1,
tmpData->GetName(),
LOG_ACTION_LEFT
);
}