changing parameter in some log-functions; run astyle

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
+1 -1
View File
@@ -152,7 +152,7 @@ void LocalBeRo::run()
LOG_ERROR(__FILE__ << " (" << __LINE__ << "): ERROR - wrong myBeRoID");
}
}
if(myHand->getLog()) myHand->getLog()->logBoardCards(myBeRoID, tempBoardCardsArray);
if(myHand->getLog()) myHand->getLog()->logBoardCards(tempBoardCardsArray);
logBoardCardsDone = true;
}
@@ -89,7 +89,7 @@ void LocalBeRoPostRiver::postRiverRun()
if ((*it_c)->getMyAction() != PLAYER_ACTION_FOLD) nonfoldPlayersCounter++;
}
if(nonfoldPlayersCounter>1) {
if(getMyHand()->getLog()) getMyHand()->getLog()->logHoleCardsHandName(GAME_STATE_POST_RIVER,getMyHand()->getActivePlayerList());
if(getMyHand()->getLog()) getMyHand()->getLog()->logHoleCardsHandName(getMyHand()->getActivePlayerList());
}
if(getMyHand()->getLog()) {
getMyHand()->getLog()->logHandWinner(getMyHand()->getActivePlayerList(), highestCardsValue, getMyHand()->getBoard()->getWinners());
+7 -4
View File
@@ -527,7 +527,7 @@ void LocalHand::switchRounds()
// logging last player action
PlayerListConstIterator previousPlayerIt = getRunningPlayerIt(previousPlayerID);
if(previousPlayerIt != runningPlayerList->end()) {
if(myLog) myLog->logPlayerAction(currentRound,(*previousPlayerIt)->getMyID()+1,myLog->transformPlayerActionLog((*previousPlayerIt)->getMyAction()),(*previousPlayerIt)->getMySet());
if(myLog) myLog->logPlayerAction((*previousPlayerIt)->getMyName(),myLog->transformPlayerActionLog((*previousPlayerIt)->getMyAction()),(*previousPlayerIt)->getMySet());
}
PlayerListIterator it, it_1;
@@ -569,6 +569,7 @@ void LocalHand::switchRounds()
myGui->refreshPot();
myGui->refreshSet();
currentRound = GAME_STATE_POST_RIVER;
myLog->setCurrentRound(currentRound);
}
// check for all in condition
@@ -630,11 +631,13 @@ void LocalHand::switchRounds()
myGui->flipHolecardsAllIn();
// Logging HoleCards
if(currentRound<GAME_STATE_RIVER) {
if(myLog) myLog->logHoleCardsHandName(currentRound,activePlayerList);
if(myLog) myLog->logHoleCardsHandName(activePlayerList);
}
if (currentRound < GAME_STATE_POST_RIVER) // do not increment past 4
if (currentRound < GAME_STATE_POST_RIVER) { // do not increment past 4
currentRound = GameState(currentRound + 1);
myLog->setCurrentRound(currentRound);
}
//log board cards for allin
if(currentRound >= GAME_STATE_FLOP) {
@@ -642,7 +645,7 @@ void LocalHand::switchRounds()
myBoard->getMyCards(tempBoardCardsArray);
myGui->logDealBoardCardsMsg(currentRound, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3], tempBoardCardsArray[4]);
if(myLog) myLog->logBoardCards(currentRound, tempBoardCardsArray);
if(myLog) myLog->logBoardCards(tempBoardCardsArray);
}
}
+1
View File
@@ -90,6 +90,7 @@ public:
void setCurrentRound(GameState theValue) {
currentRound = theValue;
myLog->setCurrentRound(currentRound);
}
GameState getCurrentRound() const {
return currentRound;