More shared_ptr in engine to prevent race conditions when accessing client engine from gui. Still incomplete.

src/engine/network_engine/clientenginefactory.cpp

@@ -35,23 +35,27 @@ ClientEngineFactory::~ClientEngineFactory()
 }
 
 
-HandInterface* ClientEngineFactory::createHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardInterface *b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC)
+boost::shared_ptr<HandInterface>
+ClientEngineFactory::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)
 {
-    return new ClientHand(f, g, b, l, sl, apl, rpl, id, sP, dP, sB, sC);
+	return boost::shared_ptr<HandInterface>(new ClientHand(f, g, b, l, sl, apl, rpl, id, sP, dP, sB, sC));
 }
 
-BoardInterface* ClientEngineFactory::createBoard(unsigned dp)
+boost::shared_ptr<BoardInterface>
+ClientEngineFactory::createBoard(unsigned dp)
 {
-    return new ClientBoard(dp);
+	return boost::shared_ptr<BoardInterface>(new ClientBoard(dp));
 }
 
-boost::shared_ptr<PlayerInterface>  ClientEngineFactory::createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB)
+boost::shared_ptr<PlayerInterface>
+ClientEngineFactory::createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB)
 {
-	return boost::shared_ptr<PlayerInterface> (new ClientPlayer(NULL, b, id, uniqueId, type, name, avatar, sC, aS, mB));
+	return boost::shared_ptr<PlayerInterface>(new ClientPlayer(NULL, b, id, uniqueId, type, name, avatar, sC, aS, mB));
 }
 
-std::vector<boost::shared_ptr<BeRoInterface> > ClientEngineFactory::createBeRo(HandInterface* hi, int id, unsigned dP, int sB) {
-
+std::vector<boost::shared_ptr<BeRoInterface> >
+ClientEngineFactory::createBeRo(HandInterface *hi, int id, unsigned dP, int sB)
+{
 	std::vector<boost::shared_ptr<BeRoInterface> > myBeRo;
 
 	myBeRo.push_back(boost::shared_ptr<BeRoInterface>(new ClientBeRo(hi, id, dP, sB, GAME_STATE_PREFLOP)));

src/engine/network_engine/clientenginefactory.h

@@ -38,11 +38,10 @@ public:
 	ClientEngineFactory();
 	~ClientEngineFactory();
 
-    HandInterface* createHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardInterface *b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC);
-    BoardInterface* createBoard(unsigned dp);
-	boost::shared_ptr<PlayerInterface> createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB);
-	std::vector<boost::shared_ptr<BeRoInterface> > createBeRo(HandInterface* hi, int id, unsigned dP, int sB);
-	
+	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<PlayerInterface> createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB);
+	virtual std::vector<boost::shared_ptr<BeRoInterface> > createBeRo(HandInterface *hi, int id, unsigned dP, int sB);
 };
 
 #endif

src/engine/network_engine/clienthand.cpp

@@ -21,7 +21,7 @@
 
 using namespace std;
 
-ClientHand::ClientHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardInterface *b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC)
+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(0),
   smallBlind(sB), startCash(sC), lastPlayersTurn(-1), allInCondition(0),
   cardsShown(false), bettingRoundsPlayed(0)
@@ -125,7 +125,7 @@ ClientHand::getRunningPlayerIt(unsigned uniqueId) const
 	return it;
 }
 
-BoardInterface*
+boost::shared_ptr<BoardInterface>
 ClientHand::getBoard() const
 {
 	return myBoard;

src/engine/network_engine/clienthand.h

@@ -33,7 +33,7 @@
 class ClientHand : public HandInterface
 {
 	public:
-        ClientHand ( boost::shared_ptr<EngineFactory> f, GuiInterface*, BoardInterface*, Log*, PlayerList, PlayerList, PlayerList , int, int, int, int, int );
+		ClientHand ( boost::shared_ptr<EngineFactory> f, GuiInterface*, boost::shared_ptr<BoardInterface>, Log*, PlayerList, PlayerList, PlayerList , int, int, int, int, int );
 		~ClientHand();
 
 		void start();
@@ -46,7 +46,7 @@ class ClientHand : public HandInterface
 		PlayerListIterator getActivePlayerIt(unsigned) const;
 		PlayerListIterator getRunningPlayerIt(unsigned) const;
 
-		BoardInterface* getBoard() const;
+		boost::shared_ptr<BoardInterface> getBoard() const;
 		boost::shared_ptr<BeRoInterface> getPreflop() const;
 		boost::shared_ptr<BeRoInterface> getFlop() const;
 		boost::shared_ptr<BeRoInterface> getTurn() const;
@@ -98,7 +98,7 @@ class ClientHand : public HandInterface
 
 		boost::shared_ptr<EngineFactory> myFactory;
 		GuiInterface *myGui;
-		BoardInterface *myBoard;
+		boost::shared_ptr<BoardInterface> myBoard;
         Log *myLog;
 
 		PlayerList seatsList;

src/engine/network_engine/clientplayer.h

@@ -35,7 +35,7 @@ public:
 	ClientPlayer(ConfigFile*, BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB);
 	~ClientPlayer();
 
-	void setHand(HandInterface*);
+	void setHand(HandInterface *);
 
 	int getMyID() const;
 	unsigned getMyUniqueID() const;