applying astyle

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
+9 -9
View File
@@ -528,29 +528,29 @@ void LocalHand::setBlinds()
void LocalHand::switchRounds() void LocalHand::switchRounds()
{ {
// logging last player action // // logging last player action
// currentPlayersTurnIt = myHand->getRunningPlayerIt( currentPlayersTurnId ); // PlayerListConstIterator previousPlayerIt = getRunningPlayerIt(previousPlayerID);
// if(currentPlayersTurnIt == myHand->getRunningPlayerList()->end()) { // if(previousPlayerIt == runningPlayerList->end()) {
// throw LocalException(__FILE__, __LINE__, ERR_RUNNING_PLAYER_NOT_FOUND); // throw LocalException(__FILE__, __LINE__, ERR_RUNNING_PLAYER_NOT_FOUND);
// } // }
// switch((*currentPlayersTurnIt)->getMyAction()) { // switch((*previousPlayerIt)->getMyAction()) {
// case PLAYER_ACTION_FOLD: { // case PLAYER_ACTION_FOLD: {
// myHand->getLog()->logPlayerAction(myBeRoID+1,(*currentPlayersTurnIt)->getMyID()+1,LOG_ACTION_FOLD); // myLog->logPlayerAction(currentRound+1,(*previousPlayerIt)->getMyID()+1,LOG_ACTION_FOLD);
// } break; // } break;
// case PLAYER_ACTION_CHECK: { // case PLAYER_ACTION_CHECK: {
// myHand->getLog()->logPlayerAction(myBeRoID+1,(*currentPlayersTurnIt)->getMyID()+1,LOG_ACTION_CHECK); // myLog->logPlayerAction(currentRound+1,(*previousPlayerIt)->getMyID()+1,LOG_ACTION_CHECK);
// } break; // } break;
// case PLAYER_ACTION_CALL: { // case PLAYER_ACTION_CALL: {
// myHand->getLog()->logPlayerAction(myBeRoID+1,(*currentPlayersTurnIt)->getMyID()+1,LOG_ACTION_CALL); // myLog->logPlayerAction(currentRound+1,(*previousPlayerIt)->getMyID()+1,LOG_ACTION_CALL);
// } break; // } break;
// case PLAYER_ACTION_BET: // case PLAYER_ACTION_BET:
// case PLAYER_ACTION_RAISE: { // case PLAYER_ACTION_RAISE: {
// myHand->getLog()->logPlayerAction(myBeRoID+1,(*currentPlayersTurnIt)->getMyID()+1,LOG_ACTION_BET,(*currentPlayersTurnIt)->getMySet()); // myLog->logPlayerAction(currentRound+1,(*previousPlayerIt)->getMyID()+1,LOG_ACTION_BET,(*previousPlayerIt)->getMySet());
// } break; // } break;
// case PLAYER_ACTION_ALLIN: { // case PLAYER_ACTION_ALLIN: {
// myHand->getLog()->logPlayerAction(myBeRoID+1,(*currentPlayersTurnIt)->getMyID()+1,LOG_ACTION_ALL_IN,(*currentPlayersTurnIt)->getMySet()); // myLog->logPlayerAction(currentRound+1,(*previousPlayerIt)->getMyID()+1,LOG_ACTION_ALL_IN,(*previousPlayerIt)->getMySet());
// } break; // } break;
// default: { // default: {
// } // }
+1 -2
View File
@@ -240,8 +240,7 @@ void Log::logNewHandMsg(int handID, unsigned dealerPosition, int smallBlind, uns
} }
if(countActivePlayer==2) { if(countActivePlayer==2) {
logPlayerAction(0,smallBlindPosition,LOG_ACTION_DEALER); logPlayerAction(0,smallBlindPosition,LOG_ACTION_DEALER);
} } else {
else {
if(dealerButtonOnTable) { if(dealerButtonOnTable) {
logPlayerAction(0,dealerPosition,LOG_ACTION_DEALER); logPlayerAction(0,dealerPosition,LOG_ACTION_DEALER);
} }
+2 -4
View File
@@ -248,13 +248,11 @@ void ChatTools::nickAutoCompletition()
if(lastChatString == "") { if(lastChatString == "") {
myLineEdit->setText(lastMatchStringList.at(nickAutoCompletitionCounter)+": "); myLineEdit->setText(lastMatchStringList.at(nickAutoCompletitionCounter)+": ");
} } else {
else {
//check if lastChatString is pm-code //check if lastChatString is pm-code
if((lastChatString == "/msg" || lastChatString == "/msg ") && lastMatchStringList.at(nickAutoCompletitionCounter).contains(" ")) { if((lastChatString == "/msg" || lastChatString == "/msg ") && lastMatchStringList.at(nickAutoCompletitionCounter).contains(" ")) {
myLineEdit->setText(lastChatString+" \""+lastMatchStringList.at(nickAutoCompletitionCounter)+"\" "); myLineEdit->setText(lastChatString+" \""+lastMatchStringList.at(nickAutoCompletitionCounter)+"\" ");
} } else {
else {
myLineEdit->setText(lastChatString+" "+lastMatchStringList.at(nickAutoCompletitionCounter)+" "); myLineEdit->setText(lastChatString+" "+lastMatchStringList.at(nickAutoCompletitionCounter)+" ");
} }
} }
+1 -2
View File
@@ -2653,8 +2653,7 @@ void gameTableImpl::showHoleCards(unsigned playerId, bool allIn)
//set Player value (logging) //set Player value (logging)
if(currentHand->getCurrentRound() < GAME_STATE_RIVER || allIn) { if(currentHand->getCurrentRound() < GAME_STATE_RIVER || allIn) {
(*it_c)->setMyCardsFlip(1,2); //for bero before postriver or allin just log the hole cards (*it_c)->setMyCardsFlip(1,2); //for bero before postriver or allin just log the hole cards
} } else {
else {
(*it_c)->setMyCardsFlip(1,1); //for postriver log the value (*it_c)->setMyCardsFlip(1,1); //for postriver log the value
} }
} }