- rename lastPlayersTurn -> previousPlayerID and lastActionPlayer -> lastActionPlayerID

src/engine/network_engine/clientboard.cpp

@@ -24,7 +24,7 @@
 using namespace std;
 
 ClientBoard::ClientBoard(unsigned dp)
-	: pot(0), sets(0), dealerPosition(dp), allInCondition(false), lastActionPlayer(0)
+        : pot(0), sets(0), dealerPosition(dp), allInCondition(false), lastActionPlayerID(0)
 {
 	myCards[0] = myCards[1] = myCards[2] = myCards[3] = myCards[4] = 0;
 }
@@ -95,10 +95,10 @@ ClientBoard::setAllInCondition(bool theValue)
 }
 
 void
-ClientBoard::setLastActionPlayer(unsigned theValue)
+ClientBoard::setLastActionPlayerID(unsigned theValue)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	lastActionPlayer = theValue;
+        lastActionPlayerID = theValue;
 }
 
 void

src/engine/network_engine/clientboard.h

@@ -45,7 +45,7 @@ public:
 	void setSets(int theValue);
 
 	void setAllInCondition(bool theValue);
-	void setLastActionPlayer(unsigned theValue);
+        void setLastActionPlayerID(unsigned theValue);
 
 	void collectSets();
 	void collectPot();
@@ -74,7 +74,7 @@ private:
 	int sets;
 	unsigned dealerPosition;
 	bool allInCondition;
-	unsigned lastActionPlayer;
+        unsigned lastActionPlayerID;
 };
 
 #endif

src/engine/network_engine/clienthand.cpp

@@ -23,7 +23,7 @@ using namespace std;
 
 ClientHand::ClientHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, boost::shared_ptr<BoardInterface> b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC)
         : myFactory(f), myGui(g),  myBoard(b), myLog(l), seatsList(sl), activePlayerList(apl), runningPlayerList(rpl), myID(id), startQuantityPlayers(sP), dealerPosition(dP), currentRound(GAME_STATE_PREFLOP),
-	  smallBlind(sB), startCash(sC), lastPlayersTurn(-1), allInCondition(0),
+          smallBlind(sB), startCash(sC), previousPlayerID(-1), allInCondition(0),
 	  cardsShown(false), bettingRoundsPlayed(0)
 {
 	PlayerListIterator it;
@@ -287,31 +287,31 @@ ClientHand::getBettingRoundsPlayed() const
 }
 
 void
-ClientHand::setLastPlayersTurn(int theValue)
+ClientHand::setPreviousPlayerID(int theValue)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	lastPlayersTurn = theValue;
+        previousPlayerID = theValue;
 }
 
 int
-ClientHand::getLastPlayersTurn() const
+ClientHand::getPreviousPlayerID() const
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	return lastPlayersTurn;
+        return previousPlayerID;
 }
 
 void
-ClientHand::setLastActionPlayer (unsigned theValue)
+ClientHand::setLastActionPlayerID (unsigned theValue)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	lastActionPlayer = theValue;
+        lastActionPlayerID = theValue;
 }
 
 unsigned
-ClientHand::getLastActionPlayer() const
+ClientHand::getLastActionPlayerID() const
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	return lastActionPlayer;
+        return lastActionPlayerID;
 }
 
 void

src/engine/network_engine/clienthand.h

@@ -81,11 +81,11 @@ public:
 	void setBettingRoundsPlayed ( int theValue );
 	int getBettingRoundsPlayed() const;
 
-	void setLastPlayersTurn ( int theValue );
-	int getLastPlayersTurn() const;
+        void setPreviousPlayerID ( int theValue );
+        int getPreviousPlayerID() const;
 
-	void setLastActionPlayer ( unsigned theValue );
-	unsigned getLastActionPlayer() const;
+        void setLastActionPlayerID ( unsigned theValue );
+        unsigned getLastActionPlayerID() const;
 
 	void setCardsShown ( bool theValue );
 	bool getCardsShown() const;
@@ -119,8 +119,8 @@ private:
 	int smallBlind;
 	int startCash;
 
-	int lastPlayersTurn;
-	unsigned lastActionPlayer;
+        int previousPlayerID;
+        unsigned lastActionPlayerID;
 
 	bool allInCondition;
 	bool cardsShown;