bugfix for #275: remove dealerPosition from constructor of localBoard and transmit when it's needed

src/engine/local_engine/localbero.cpp

@@ -38,7 +38,7 @@
 using namespace std;
 
 LocalBeRo::LocalBeRo(HandInterface* hi, unsigned dP, int sB, GameState gS)
-	: BeRoInterface(), myHand(hi), myBeRoID(gS), dealerPosition(dP), smallBlindPosition(0), dealerPositionId(dP), smallBlindPositionId(0), bigBlindPositionId(0), smallBlind(sB), highestSet(0), minimumRaise(2*sB), fullBetRule(false), firstRun(true), firstRunGui(true), firstRound(true), firstHeadsUpRound(true), currentPlayersTurnId(0), firstRoundLastPlayersTurnId(0), logBoardCardsDone(false)
+    : BeRoInterface(), myHand(hi), myBeRoID(gS), dealerPosition(dP), smallBlindPosition(0), smallBlindPositionId(0), bigBlindPositionId(0), smallBlind(sB), highestSet(0), minimumRaise(2*sB), fullBetRule(false), firstRun(true), firstRunGui(true), firstRound(true), firstHeadsUpRound(true), currentPlayersTurnId(0), firstRoundLastPlayersTurnId(0), logBoardCardsDone(false)
 {
 	currentPlayersTurnIt = myHand->getRunningPlayerList()->begin();
 	lastPlayersTurnIt = myHand->getRunningPlayerList()->begin();

src/engine/local_engine/localbero.h

@@ -81,12 +81,9 @@ protected:
 		return myHand;
 	}
 
-	int getDealerPosition() const {
+    unsigned getDealerPosition() const {
 		return dealerPosition;
 	}
-	void setDealerPosition(int theValue) {
-		dealerPosition = theValue;
-	}
 
 	void setCurrentPlayersTurnId(unsigned theValue) {
 		currentPlayersTurnId = theValue;
@@ -137,14 +134,6 @@ protected:
 		return firstRound;
 	}
 
-
-	void setDealerPositionId(unsigned theValue) {
-		dealerPositionId = theValue;
-	}
-	unsigned getDealerPositionId() const {
-		return dealerPositionId;
-	}
-
 	void setSmallBlindPositionId(unsigned theValue) {
 		smallBlindPositionId = theValue;
 	}
@@ -182,10 +171,9 @@ private:
 	HandInterface* myHand;
 
 	const GameState myBeRoID;
-	int dealerPosition;
+    unsigned dealerPosition;
 	int smallBlindPosition;
 
-	unsigned dealerPositionId;
 	unsigned smallBlindPositionId;
 	unsigned bigBlindPositionId;
 

src/engine/local_engine/localberopostriver.cpp

@@ -91,7 +91,7 @@ void LocalBeRoPostRiver::postRiverRun()
 	getMyHand()->getBoard()->determinePlayerNeedToShowCards();
 
 	// Pot-Verteilung
-	getMyHand()->getBoard()->distributePot();
+    getMyHand()->getBoard()->distributePot(getDealerPosition());
 
 	//Pot auf 0 setzen
 	getMyHand()->getBoard()->setPot(0);

src/engine/local_engine/localboard.cpp

@@ -37,7 +37,7 @@
 #include "localexception.h"
 #include "engine_msg.h"
 
-LocalBoard::LocalBoard(unsigned dp) : BoardInterface(), pot(0), sets(0), dealerPosition(dp), allInCondition(false), lastActionPlayerID(0)
+LocalBoard::LocalBoard() : BoardInterface(), pot(0), sets(0), allInCondition(false), lastActionPlayerID(0)
 {
 	myCards[0] = myCards[1] = myCards[2] = myCards[3] = myCards[4] = 0;
 }
@@ -78,7 +78,7 @@ void LocalBoard::collectPot()
 
 }
 
-void LocalBoard::distributePot()
+void LocalBoard::distributePot(unsigned dealerPosition)
 {
 
 	winners.clear();

src/engine/local_engine/localboard.h

@@ -45,7 +45,7 @@ class HandInterface;
 class LocalBoard : public BoardInterface
 {
 public:
-	LocalBoard(unsigned dealerPosition);
+    LocalBoard();
 	~LocalBoard();
 
 	void setPlayerLists(PlayerList, PlayerList, PlayerList);
@@ -82,7 +82,7 @@ public:
 	void collectSets() ;
 	void collectPot() ;
 
-	void distributePot();
+    void distributePot(unsigned dealerPosition);
 	void determinePlayerNeedToShowCards();
 
 	std::list<unsigned> getWinners() const {
@@ -111,7 +111,6 @@ private:
 	int myCards[5];
 	int pot;
 	int sets;
-	unsigned dealerPosition;
 	bool allInCondition;
 	unsigned lastActionPlayerID;
 

src/engine/local_engine/localenginefactory.cpp

@@ -61,9 +61,9 @@ LocalEngineFactory::createHand(boost::shared_ptr<EngineFactory> f, GuiInterface
 }
 
 boost::shared_ptr<BoardInterface>
-LocalEngineFactory::createBoard(unsigned dp)
+LocalEngineFactory::createBoard()
 {
-	return boost::shared_ptr<BoardInterface>(new LocalBoard(dp));
+    return boost::shared_ptr<BoardInterface>(new LocalBoard());
 }
 
 boost::shared_ptr<PlayerInterface>

src/engine/local_engine/localenginefactory.h

@@ -50,7 +50,7 @@ public:
 	~LocalEngineFactory();
 
 	virtual boost::shared_ptr<HandInterface> createHand(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);
-	virtual boost::shared_ptr<BoardInterface> createBoard(unsigned dp);
+    virtual boost::shared_ptr<BoardInterface> createBoard();
 	virtual boost::shared_ptr<PlayerInterface> createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB);
 	virtual std::vector<boost::shared_ptr<BeRoInterface> > createBeRo(HandInterface *hi, unsigned dP, int sB);