actual -> current ;)

src/engine/network_engine/clientboard.cpp

@@ -24,7 +24,7 @@
 using namespace std;
 
 ClientBoard::ClientBoard()
-: playerArray(0), actualHand(0), pot(0), sets(0)
+: playerArray(0), currentHand(0), pot(0), sets(0)
 {
 }
 
@@ -47,7 +47,7 @@ void
 ClientBoard::setHand(HandInterface* br)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	actualHand = br;
+	currentHand = br;
 }
 
 void

src/engine/network_engine/clientboard.h

@@ -60,7 +60,7 @@ private:
 	PlayerList activePlayerList;
 	PlayerList runningPlayerList;
 
-	HandInterface *actualHand;
+	HandInterface *currentHand;
 
 	std::list<int> winners;
 

src/engine/network_engine/clienthand.cpp

@@ -22,7 +22,7 @@
 using namespace std;
 
 ClientHand::ClientHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardInterface *b, std::vector<boost::shared_ptr<PlayerInterface> > sl_old, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC)
-: myFactory(f), myGui(g),  myBoard(b), playerArray(sl_old), seatsList(sl), activePlayerList(apl), runningPlayerList(rpl), myID(id), startQuantityPlayers(sP), dealerPosition(dP), actualRound(0),
+: myFactory(f), myGui(g),  myBoard(b), playerArray(sl_old), seatsList(sl), activePlayerList(apl), runningPlayerList(rpl), myID(id), startQuantityPlayers(sP), dealerPosition(dP), currentRound(0),
   smallBlind(sB), startCash(sC), lastPlayersTurn(0), allInCondition(0),
   cardsShown(false), bettingRoundsPlayed(0)
 {
@@ -166,7 +166,7 @@ ClientHand::getRiver() const
 boost::shared_ptr<BeRoInterface>
 ClientHand::getCurrentBeRo() const
 {
-	return myBeRo[actualRound];
+	return myBeRo[currentRound];
 }
 
 
@@ -205,17 +205,17 @@ ClientHand::getStartQuantityPlayers() const
 }
 
 void
-ClientHand::setActualRound(int theValue)
+ClientHand::setCurrentRound(int theValue)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	actualRound = theValue;
+	currentRound = theValue;
 }
 
 int
-ClientHand::getActualRound() const
+ClientHand::getCurrentRound() const
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	return actualRound;
+	return currentRound;
 }
 
 void

src/engine/network_engine/clienthand.h

@@ -57,14 +57,14 @@ class ClientHand : public HandInterface
 		void setMyID ( int theValue );
 		int getMyID() const;
 
-		void setActualQuantityPlayers ( int theValue );
-		int getActualQuantityPlayers() const;
+		void setCurrentQuantityPlayers ( int theValue );
+		int getCurrentQuantityPlayers() const;
 
 		void setStartQuantityPlayers ( int theValue );
 		int getStartQuantityPlayers() const;
 
-		void setActualRound ( int theValue );
-		int getActualRound() const;
+		void setCurrentRound ( int theValue );
+		int getCurrentRound() const;
 
 		void setDealerPosition ( int theValue );
 		int getDealerPosition() const;
@@ -106,8 +106,8 @@ class ClientHand : public HandInterface
 
 		int myID;
 		int startQuantityPlayers;
-		int dealerPosition; // -1 -> neutral
-		int actualRound; //0 = preflop, 1 = flop, 2 = turn, 3 = river
+		unsigned dealerPosition;
+		int currentRound; //0 = preflop, 1 = flop, 2 = turn, 3 = river
 		int smallBlind;
 		int startCash;
 

src/engine/network_engine/clientplayer.cpp

@@ -23,7 +23,7 @@ using namespace std;
 
 
 ClientPlayer::ClientPlayer(ConfigFile *c, BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB)
-: PlayerInterface(), myConfig(c), actualHand(0), actualBoard(b), myCardsValue(0), myID(id), myUniqueID(uniqueId), myType(type), myName(name), myAvatar(avatar), myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), myCash(sC), mySet(0), myLastRelativeSet(0), myAction(0), myButton(mB), myActiveStatus(aS), myTurn(0), myRoundStartCash(0), sBluff(0), sBluffStatus(0)
+: PlayerInterface(), myConfig(c), currentHand(0), currentBoard(b), myCardsValue(0), myID(id), myUniqueID(uniqueId), myType(type), myName(name), myAvatar(avatar), myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), myCash(sC), mySet(0), myLastRelativeSet(0), myAction(0), myButton(mB), myActiveStatus(aS), myTurn(0), myRoundStartCash(0), sBluff(0), sBluffStatus(0)
 {
 }
 
@@ -37,7 +37,7 @@ void
 ClientPlayer::setHand(HandInterface* br)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
-	actualHand = br;
+	currentHand = br;
 }
 
 int
@@ -244,11 +244,11 @@ ClientPlayer::setMyCardsFlip(bool theValue, int state)
 	// log flipping cards
 	if (myCardsFlip) {
 		switch(state) {
-			case 1: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt);
+			case 1: currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt);
 			break;
-			case 2: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1]);
+			case 2: currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1]);
 			break;
-			case 3: actualHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt, "has");
+			case 3: currentHand->getGuiInterface()->logFlipHoleCardsMsg(myName, myCards[0], myCards[1], myCardsValueInt, "has");
 			break;
 			default: ;
 		}
@@ -379,7 +379,7 @@ ClientPlayer::setMyWinnerState(bool theValue, int pot)
 {
 	boost::recursive_mutex::scoped_lock lock(m_syncMutex);
 	if(theValue) myWinnerState = theValue;
-	actualHand->getGuiInterface()->logPlayerWinsMsg(myName, pot, theValue);
+	currentHand->getGuiInterface()->logPlayerWinsMsg(myName, pot, theValue);
 }
 
 bool

src/engine/network_engine/clientplayer.h

@@ -132,8 +132,8 @@ private:
 	mutable boost::recursive_mutex m_syncMutex;
 
 	ConfigFile *myConfig;
-	HandInterface *actualHand;
-	BoardInterface *actualBoard;
+	HandInterface *currentHand;
+	BoardInterface *currentBoard;
 
 	CardsValue *myCardsValue;