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

delete no longer required "playersTurn"

Browse Source
This commit is contained in:
floty
2010-09-29 20:56:38 +00:00
parent 377f6dde6e
commit 3141743430
5 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/berointerface.h
-3
View File
@@ -37,9 +37,6 @@ public:
virtual GameState getMyBeRoID() const =0; virtual GameState getMyBeRoID() const =0;
virtual void setPlayersTurn(int) =0;
virtual int getPlayersTurn() const =0;
virtual void setCurrentPlayersTurnId(unsigned) =0; virtual void setCurrentPlayersTurnId(unsigned) =0;
virtual unsigned getCurrentPlayersTurnId() const =0; virtual unsigned getCurrentPlayersTurnId() const =0;
src/engine/local_engine/localbero.h
-4
View File
@@ -57,9 +57,6 @@ protected:
int getDealerPosition() const {return dealerPosition; } int getDealerPosition() const {return dealerPosition; }
void setDealerPosition(int theValue) { dealerPosition = theValue; } void setDealerPosition(int theValue) { dealerPosition = theValue; }
void setPlayersTurn(int theValue) { playersTurn = theValue; }
int getPlayersTurn() const { return playersTurn;}
void setCurrentPlayersTurnId(unsigned theValue) { currentPlayersTurnId = theValue; } void setCurrentPlayersTurnId(unsigned theValue) { currentPlayersTurnId = theValue; }
unsigned getCurrentPlayersTurnId() const { return currentPlayersTurnId;} unsigned getCurrentPlayersTurnId() const { return currentPlayersTurnId;}
@@ -125,7 +122,6 @@ private:
bool firstRound; bool firstRound;
bool firstHeadsUpRound; bool firstHeadsUpRound;
int playersTurn; // TODO -> delete
PlayerListIterator currentPlayersTurnIt; // iterator for runningPlayerList PlayerListIterator currentPlayersTurnIt; // iterator for runningPlayerList
PlayerListIterator lastPlayersTurnIt; // iterator for runningPlayerList PlayerListIterator lastPlayersTurnIt; // iterator for runningPlayerList
src/engine/network_engine/clientbero.cpp
+2 -16
View File
@@ -19,8 +19,8 @@
***************************************************************************/ ***************************************************************************/
#include "clientbero.h" #include "clientbero.h"
ClientBeRo::ClientBeRo(HandInterface* hi, int /*id*/, unsigned dP, int sB, GameState gS) 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) : 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; 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 void
ClientBeRo::setCurrentPlayersTurnIt(PlayerListIterator theValue) ClientBeRo::setCurrentPlayersTurnIt(PlayerListIterator theValue)
{ {
src/engine/network_engine/clientbero.h
-4
View File
@@ -41,9 +41,6 @@ public:
void setLastActionPlayer ( unsigned theValue ); void setLastActionPlayer ( unsigned theValue );
unsigned getLastActionPlayer() const; unsigned getLastActionPlayer() const;
void setPlayersTurn(int theValue);
int getPlayersTurn() const;
void setSmallBlindPositionId(unsigned theValue); void setSmallBlindPositionId(unsigned theValue);
unsigned getSmallBlindPositionId() const; unsigned getSmallBlindPositionId() const;
@@ -97,7 +94,6 @@ private:
int highestCardsValue; int highestCardsValue;
int playersTurn; // TODO -> delete
PlayerListIterator currentPlayersTurnIt; // iterator for runningPlayerList PlayerListIterator currentPlayersTurnIt; // iterator for runningPlayerList
PlayerListIterator lastPlayersTurnIt; // iterator for runningPlayerList PlayerListIterator lastPlayersTurnIt; // iterator for runningPlayerList
src/net/common/clientstate.cpp
-1
View File
@@ -1907,7 +1907,6 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
// Next player's turn. // Next player's turn.
curGame->getCurrentHand()->getCurrentBeRo()->setCurrentPlayersTurnId(tmpPlayer->getMyID()); curGame->getCurrentHand()->getCurrentBeRo()->setCurrentPlayersTurnId(tmpPlayer->getMyID());
curGame->getCurrentHand()->getCurrentBeRo()->setPlayersTurn(tmpPlayer->getMyID());
// Mark current player in GUI. // Mark current player in GUI.
int guiStatus = 2; int guiStatus = 2;