From a2d0272ed359ec263715d6f59b7dbf97e45b03c4 Mon Sep 17 00:00:00 2001 From: floty Date: Wed, 12 Jan 2011 22:33:03 +0000 Subject: [PATCH] remove board-pointer from player --- src/engine/enginefactory.h | 2 +- .../local_engine/localenginefactory.cpp | 4 +-- src/engine/local_engine/localenginefactory.h | 2 +- src/engine/local_engine/localplayer.cpp | 26 +++++++++---------- src/engine/local_engine/localplayer.h | 4 +-- .../network_engine/clientenginefactory.cpp | 4 +-- .../network_engine/clientenginefactory.h | 2 +- src/engine/network_engine/clientplayer.cpp | 6 ++--- src/engine/network_engine/clientplayer.h | 4 +-- src/game.cpp | 2 +- 10 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/engine/enginefactory.h b/src/engine/enginefactory.h index 9f1c4d4c..ecf3f452 100644 --- a/src/engine/enginefactory.h +++ b/src/engine/enginefactory.h @@ -33,7 +33,7 @@ public: virtual boost::shared_ptr createHand(boost::shared_ptr f, GuiInterface *g, boost::shared_ptr b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC) =0; virtual boost::shared_ptr createBoard(unsigned dp) =0; - virtual boost::shared_ptr createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) =0; + virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) =0; virtual std::vector > createBeRo(HandInterface *hi, int id, unsigned dP, int sB) =0; }; diff --git a/src/engine/local_engine/localenginefactory.cpp b/src/engine/local_engine/localenginefactory.cpp index 239e8fda..68a8d22c 100644 --- a/src/engine/local_engine/localenginefactory.cpp +++ b/src/engine/local_engine/localenginefactory.cpp @@ -55,9 +55,9 @@ LocalEngineFactory::createBoard(unsigned dp) } boost::shared_ptr -LocalEngineFactory::createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) +LocalEngineFactory::createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) { - return boost::shared_ptr (new LocalPlayer(myConfig, b, id, uniqueId, type, name, avatar, sC, aS, mB)); + return boost::shared_ptr (new LocalPlayer(myConfig, id, uniqueId, type, name, avatar, sC, aS, mB)); } std::vector > diff --git a/src/engine/local_engine/localenginefactory.h b/src/engine/local_engine/localenginefactory.h index 63989ff0..729ef707 100644 --- a/src/engine/local_engine/localenginefactory.h +++ b/src/engine/local_engine/localenginefactory.h @@ -39,7 +39,7 @@ public: virtual boost::shared_ptr createHand(boost::shared_ptr f, GuiInterface *g, boost::shared_ptr b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC); virtual boost::shared_ptr createBoard(unsigned dp); - virtual boost::shared_ptr createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); + virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); virtual std::vector > createBeRo(HandInterface *hi, int id, unsigned dP, int sB); private: diff --git a/src/engine/local_engine/localplayer.cpp b/src/engine/local_engine/localplayer.cpp index f3ee99d6..ab482fb5 100755 --- a/src/engine/local_engine/localplayer.cpp +++ b/src/engine/local_engine/localplayer.cpp @@ -849,8 +849,8 @@ static const RoundData FlopValues[] = #define NUM_PREFLOP_VALUES (sizeof(PreflopValues)/sizeof(RoundData)) #define NUM_FLOP_VALUES (sizeof(FlopValues)/sizeof(RoundData)) -LocalPlayer::LocalPlayer(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), 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), myStayOnTableStatus(1), myTurn(0), myCardsFlip(0), myRoundStartCash(0), lastMoneyWon(0), sBluff(0), sBluffStatus(0), myWinnerState(false), m_actionTimeoutCounter(0) +LocalPlayer::LocalPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) + : PlayerInterface(), myConfig(c), currentHand(0), 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), myStayOnTableStatus(1), myTurn(0), myCardsFlip(0), myRoundStartCash(0), lastMoneyWon(0), sBluff(0), sBluffStatus(0), myWinnerState(false), m_actionTimeoutCounter(0) { // !!!!!!!!!!!!!!!!!!!!!!!! testing !!!!!!!!!!!!!!!!!!!!!!!! @@ -1012,7 +1012,7 @@ void LocalPlayer::action() { if(myConfig->readConfigInt("EngineVersion")) preflopEngine3(); else preflopEngine(); - currentBoard->collectSets(); + currentHand->getBoard()->collectSets(); currentHand->getGuiInterface()->refreshPot(); } break; @@ -1021,7 +1021,7 @@ void LocalPlayer::action() { if(myConfig->readConfigInt("EngineVersion")) flopEngine3(); else flopEngine(); - currentBoard->collectSets(); + currentHand->getBoard()->collectSets(); currentHand->getGuiInterface()->refreshPot(); } break; @@ -1030,7 +1030,7 @@ void LocalPlayer::action() { if(myConfig->readConfigInt("EngineVersion")) turnEngine3(); else turnEngine(); - currentBoard->collectSets(); + currentHand->getBoard()->collectSets(); currentHand->getGuiInterface()->refreshPot(); } break; @@ -1039,7 +1039,7 @@ void LocalPlayer::action() { if(myConfig->readConfigInt("EngineVersion")) riverEngine3(); else riverEngine(); - currentBoard->collectSets(); + currentHand->getBoard()->collectSets(); currentHand->getGuiInterface()->refreshPot(); } break; @@ -4010,7 +4010,7 @@ void LocalPlayer::calcMyOdds() { int i; for(i=0; i<2; i++) tempArray[i] = myCards[i]; - currentBoard->getMyCards(boardCards); + currentHand->getBoard()->getMyCards(boardCards); for(i=0; i<3; i++) tempArray[2+i] = boardCards[i]; // cout << myID << ": "; @@ -4055,7 +4055,7 @@ void LocalPlayer::calcMyOdds() { int tempBoardCardsArray[5]; int tempMyCardsArray[7]; int tempOpponentCardsArray[7]; - currentBoard->getMyCards(tempBoardCardsArray); + currentHand->getBoard()->getMyCards(tempBoardCardsArray); tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[1] = myCards[1]; @@ -4111,7 +4111,7 @@ void LocalPlayer::calcMyOdds() { int tempBoardCardsArray[5]; int tempMyCardsArray[7]; int tempOpponentCardsArray[7]; - currentBoard->getMyCards(tempBoardCardsArray); + currentHand->getBoard()->getMyCards(tempBoardCardsArray); tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[1] = myCards[1]; @@ -4609,7 +4609,7 @@ void LocalPlayer::flopEngine3() { int tempBoardCardsArray[5]; int tempMyCardsArray[7]; int tempOpponentCardsArray[7]; - currentBoard->getMyCards(tempBoardCardsArray); + currentHand->getBoard()->getMyCards(tempBoardCardsArray); tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[1] = myCards[1]; @@ -4780,7 +4780,7 @@ void LocalPlayer::turnEngine3() { int tempBoardCardsArray[5]; int tempMyCardsArray[7]; int tempOpponentCardsArray[7]; - currentBoard->getMyCards(tempBoardCardsArray); + currentHand->getBoard()->getMyCards(tempBoardCardsArray); tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[1] = myCards[1]; @@ -4946,7 +4946,7 @@ void LocalPlayer::riverEngine3() { int tempBoardCardsArray[5]; int tempMyCardsArray[7]; int tempOpponentCardsArray[7]; - currentBoard->getMyCards(tempBoardCardsArray); + currentHand->getBoard()->getMyCards(tempBoardCardsArray); tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[1] = myCards[1]; @@ -5130,7 +5130,7 @@ LocalPlayer::resetActionTimeoutCounter() bool LocalPlayer::checkIfINeedToShowCards() { - std::list playerNeedToShowCardsList = currentBoard->getPlayerNeedToShowCards(); + std::list playerNeedToShowCardsList = currentHand->getBoard()->getPlayerNeedToShowCards(); for(std::list::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); it++) { if(*it == myUniqueID) return true; diff --git a/src/engine/local_engine/localplayer.h b/src/engine/local_engine/localplayer.h index 258a4443..82a2616f 100755 --- a/src/engine/local_engine/localplayer.h +++ b/src/engine/local_engine/localplayer.h @@ -29,11 +29,10 @@ class CardsValue; class ConfigFile; class HandInterface; -class BoardInterface; class LocalPlayer : public PlayerInterface{ public: - LocalPlayer(ConfigFile*, BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); + LocalPlayer(ConfigFile*, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); ~LocalPlayer(); @@ -189,7 +188,6 @@ private: ConfigFile *myConfig; HandInterface *currentHand; - BoardInterface *currentBoard; CardsValue *myCardsValue; diff --git a/src/engine/network_engine/clientenginefactory.cpp b/src/engine/network_engine/clientenginefactory.cpp index 3abd9ac7..685eaa5f 100644 --- a/src/engine/network_engine/clientenginefactory.cpp +++ b/src/engine/network_engine/clientenginefactory.cpp @@ -48,9 +48,9 @@ ClientEngineFactory::createBoard(unsigned dp) } boost::shared_ptr -ClientEngineFactory::createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) +ClientEngineFactory::createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) { - return boost::shared_ptr(new ClientPlayer(NULL, b, id, uniqueId, type, name, avatar, sC, aS, mB)); + return boost::shared_ptr(new ClientPlayer(NULL, id, uniqueId, type, name, avatar, sC, aS, mB)); } std::vector > diff --git a/src/engine/network_engine/clientenginefactory.h b/src/engine/network_engine/clientenginefactory.h index 38e936cc..3d9062b6 100644 --- a/src/engine/network_engine/clientenginefactory.h +++ b/src/engine/network_engine/clientenginefactory.h @@ -40,7 +40,7 @@ public: virtual boost::shared_ptr createHand(boost::shared_ptr f, GuiInterface *g, boost::shared_ptr b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC); virtual boost::shared_ptr createBoard(unsigned dp); - virtual boost::shared_ptr createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); + virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); virtual std::vector > createBeRo(HandInterface *hi, int id, unsigned dP, int sB); }; diff --git a/src/engine/network_engine/clientplayer.cpp b/src/engine/network_engine/clientplayer.cpp index 445fd03b..fb7f0a9d 100644 --- a/src/engine/network_engine/clientplayer.cpp +++ b/src/engine/network_engine/clientplayer.cpp @@ -22,8 +22,8 @@ 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), currentHand(0), currentBoard(b), myCardsValue(0), myID(id), myUniqueID(uniqueId), myType(type), +ClientPlayer::ClientPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) +: PlayerInterface(), myConfig(c), currentHand(0), 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), myStayOnTableStatus(true), myTurn(false), myCardsFlip(false), myRoundStartCash(0), lastMoneyWon(0), sBluff(0), sBluffStatus(false), myWinnerState(false) @@ -526,7 +526,7 @@ boost::shared_ptr ClientPlayer::getNetSessionData() bool ClientPlayer::checkIfINeedToShowCards() { boost::recursive_mutex::scoped_lock lock(m_syncMutex); - std::list playerNeedToShowCardsList = currentBoard->getPlayerNeedToShowCards(); + std::list playerNeedToShowCardsList = currentHand->getBoard()->getPlayerNeedToShowCards(); for(std::list::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); it++) { if(*it == myUniqueID) return true; diff --git a/src/engine/network_engine/clientplayer.h b/src/engine/network_engine/clientplayer.h index 9d1369ae..02331756 100644 --- a/src/engine/network_engine/clientplayer.h +++ b/src/engine/network_engine/clientplayer.h @@ -28,11 +28,10 @@ class CardsValue; class ConfigFile; class HandInterface; -class BoardInterface; class ClientPlayer : public PlayerInterface{ public: - ClientPlayer(ConfigFile*, BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); + ClientPlayer(ConfigFile*, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); ~ClientPlayer(); void setHand(HandInterface *); @@ -146,7 +145,6 @@ private: ConfigFile *myConfig; HandInterface *currentHand; - BoardInterface *currentBoard; CardsValue *myCardsValue; diff --git a/src/game.cpp b/src/game.cpp index 5d57a858..cf68234b 100755 --- a/src/game.cpp +++ b/src/game.cpp @@ -93,7 +93,7 @@ Game::Game(GuiInterface* gui, boost::shared_ptr factory, } // create player objects - boost::shared_ptr tmpPlayer = myFactory->createPlayer(currentBoard.get(), i, uniqueId, type, myName, myAvatarFile, startCash, startQuantityPlayers > i, 0); + boost::shared_ptr tmpPlayer = myFactory->createPlayer(i, uniqueId, type, myName, myAvatarFile, startCash, startQuantityPlayers > i, 0); tmpPlayer->setNetSessionData(myNetSession);