From ee76f454bd0175d6cff1e6a63316989aae7fb171 Mon Sep 17 00:00:00 2001 From: lotodore Date: Thu, 7 Jun 2007 18:52:58 +0000 Subject: [PATCH] Linefeeds. --- src/engine/network_engine/clientplayer.h | 42 ++++++++++++------------ src/net/common/clientstate.cpp | 16 ++++----- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/engine/network_engine/clientplayer.h b/src/engine/network_engine/clientplayer.h index 78d977f5..5150f784 100644 --- a/src/engine/network_engine/clientplayer.h +++ b/src/engine/network_engine/clientplayer.h @@ -77,22 +77,22 @@ public: void setMyTurn(bool theValue){ myTurn = theValue;} bool getMyTurn() const{ return myTurn;} - void setMyCardsFlip(bool theValue, int state){ - myCardsFlip = theValue; - // log flipping cards - if(myCardsFlip) { - switch(state) { - case 1: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt); - break; - case 2: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1]); - break; - case 3: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt, "has"); - break; - default: ; - } - } - } - bool getMyCardsFlip() const{ return myCardsFlip;} + void setMyCardsFlip(bool theValue, int state){ + myCardsFlip = theValue; + // log flipping cards + if(myCardsFlip) { + switch(state) { + case 1: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt); + break; + case 2: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1]); + break; + case 3: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt, "has"); + break; + default: ; + } + } + } + bool getMyCardsFlip() const{ return myCardsFlip;} void setMyCardsValueInt(int theValue) { myCardsValueInt = theValue;} int getMyCardsValueInt() const { return myCardsValueInt; } @@ -126,11 +126,11 @@ public: void setSBluffStatus ( bool theValue ) { sBluffStatus = theValue; } bool getSBluffStatus() const { return sBluffStatus; } - void setMyWinnerState ( bool theValue, int pot ) { - myWinnerState = theValue; - if(theValue) actualHand->getGuiInterface()->logPlayerWinsMsg(myID, pot); - } - bool getMyWinnerState() const { return myWinnerState;} + void setMyWinnerState ( bool theValue, int pot ) { + myWinnerState = theValue; + if(theValue) actualHand->getGuiInterface()->logPlayerWinsMsg(myID, pot); + } + bool getMyWinnerState() const { return myWinnerState;} void action(); diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 826083f5..ac4d7551 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -611,14 +611,14 @@ ClientStateRunHand::InternalProcess(ClientThread &client, boost::shared_ptrsetMyButton(BUTTON_BIG_BLIND); else // no blind -> log { - if (actionDoneData.playerAction) - { - assert(actionDoneData.totalPlayerBet >= (unsigned)tmpPlayer->getMySet()); - client.GetGui().logPlayerActionMsg( - tmpPlayer->getMyName(), - actionDoneData.playerAction, - actionDoneData.totalPlayerBet - tmpPlayer->getMySet()); - } + if (actionDoneData.playerAction) + { + assert(actionDoneData.totalPlayerBet >= (unsigned)tmpPlayer->getMySet()); + client.GetGui().logPlayerActionMsg( + tmpPlayer->getMyName(), + actionDoneData.playerAction, + actionDoneData.totalPlayerBet - tmpPlayer->getMySet()); + } } tmpPlayer->setMyAction(actionDoneData.playerAction);