diff --git a/src/engine/berointerface.h b/src/engine/berointerface.h index 70207f56..702b37ea 100644 --- a/src/engine/berointerface.h +++ b/src/engine/berointerface.h @@ -37,9 +37,6 @@ public: virtual GameState getMyBeRoID() const =0; - virtual void setPlayersTurn(int) =0; - virtual int getPlayersTurn() const =0; - virtual void setCurrentPlayersTurnId(unsigned) =0; virtual unsigned getCurrentPlayersTurnId() const =0; diff --git a/src/engine/local_engine/localbero.h b/src/engine/local_engine/localbero.h index 8a6e9485..5ae15601 100644 --- a/src/engine/local_engine/localbero.h +++ b/src/engine/local_engine/localbero.h @@ -57,9 +57,6 @@ protected: int getDealerPosition() const {return dealerPosition; } void setDealerPosition(int theValue) { dealerPosition = theValue; } - void setPlayersTurn(int theValue) { playersTurn = theValue; } - int getPlayersTurn() const { return playersTurn;} - void setCurrentPlayersTurnId(unsigned theValue) { currentPlayersTurnId = theValue; } unsigned getCurrentPlayersTurnId() const { return currentPlayersTurnId;} @@ -125,7 +122,6 @@ private: bool firstRound; bool firstHeadsUpRound; - int playersTurn; // TODO -> delete PlayerListIterator currentPlayersTurnIt; // iterator for runningPlayerList PlayerListIterator lastPlayersTurnIt; // iterator for runningPlayerList diff --git a/src/engine/network_engine/clientbero.cpp b/src/engine/network_engine/clientbero.cpp index a38e326e..e8bcdadc 100644 --- a/src/engine/network_engine/clientbero.cpp +++ b/src/engine/network_engine/clientbero.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "clientbero.h" -ClientBeRo::ClientBeRo(HandInterface* hi, int /*id*/, unsigned dP, int sB, GameState gS) -: BeRoInterface(), myBeRoID(gS), myHand(hi), highestCardsValue(0), playersTurn(dP), highestSet(0), firstRound(true), smallBlindPosition(0), smallBlind(sB), minimumRaise(0), fullBetRule(false) +ClientBeRo::ClientBeRo(HandInterface* hi, int /*id*/, unsigned /*dP*/, int sB, GameState gS) +: BeRoInterface(), myBeRoID(gS), myHand(hi), highestCardsValue(0), highestSet(0), firstRound(true), smallBlindPosition(0), smallBlind(sB), minimumRaise(0), fullBetRule(false) { } @@ -63,20 +63,6 @@ ClientBeRo::getLastActionPlayer() const return lastActionPlayer; } -void -ClientBeRo::setPlayersTurn(int theValue) -{ - boost::recursive_mutex::scoped_lock lock(m_syncMutex); - playersTurn = theValue; -} - -int -ClientBeRo::getPlayersTurn() const -{ - boost::recursive_mutex::scoped_lock lock(m_syncMutex); - return playersTurn; -} - void ClientBeRo::setCurrentPlayersTurnIt(PlayerListIterator theValue) { diff --git a/src/engine/network_engine/clientbero.h b/src/engine/network_engine/clientbero.h index 1d9b5b27..4256b498 100644 --- a/src/engine/network_engine/clientbero.h +++ b/src/engine/network_engine/clientbero.h @@ -38,11 +38,8 @@ public: int getHighestCardsValue() const; void setHighestCardsValue(int theValue); - void setLastActionPlayer ( unsigned theValue ); - unsigned getLastActionPlayer() const; - - void setPlayersTurn(int theValue); - int getPlayersTurn() const; + void setLastActionPlayer ( unsigned theValue ); + unsigned getLastActionPlayer() const; void setSmallBlindPositionId(unsigned theValue); unsigned getSmallBlindPositionId() const; @@ -97,7 +94,6 @@ private: int highestCardsValue; - int playersTurn; // TODO -> delete PlayerListIterator currentPlayersTurnIt; // iterator for runningPlayerList PlayerListIterator lastPlayersTurnIt; // iterator for runningPlayerList diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 47a2e117..5130008d 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -1907,7 +1907,6 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr client, // Next player's turn. curGame->getCurrentHand()->getCurrentBeRo()->setCurrentPlayersTurnId(tmpPlayer->getMyID()); - curGame->getCurrentHand()->getCurrentBeRo()->setPlayersTurn(tmpPlayer->getMyID()); // Mark current player in GUI. int guiStatus = 2;