sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove board-pointer from player

Browse Source
This commit is contained in:
floty
2011-01-12 22:33:03 +00:00
parent 0fffc9476e
commit a2d0272ed3
10 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/enginefactory.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
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) =0; 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) =0;
virtual boost::shared_ptr<BoardInterface> createBoard(unsigned dp) =0; virtual boost::shared_ptr<BoardInterface> createBoard(unsigned dp) =0;
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) =0; virtual boost::shared_ptr<PlayerInterface> createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) =0;
virtual std::vector<boost::shared_ptr<BeRoInterface> > createBeRo(HandInterface *hi, int id, unsigned dP, int sB) =0; virtual std::vector<boost::shared_ptr<BeRoInterface> > createBeRo(HandInterface *hi, int id, unsigned dP, int sB) =0;
}; };
src/engine/local_engine/localenginefactory.cpp
+2 -2
View File
@@ -55,9 +55,9 @@ LocalEngineFactory::createBoard(unsigned dp)
} }
boost::shared_ptr<PlayerInterface> boost::shared_ptr<PlayerInterface>
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<PlayerInterface> (new LocalPlayer(myConfig, b, id, uniqueId, type, name, avatar, sC, aS, mB)); return boost::shared_ptr<PlayerInterface> (new LocalPlayer(myConfig, id, uniqueId, type, name, avatar, sC, aS, mB));
} }
std::vector<boost::shared_ptr<BeRoInterface> > std::vector<boost::shared_ptr<BeRoInterface> >
src/engine/local_engine/localenginefactory.h
+1 -1
View File
@@ -39,7 +39,7 @@ public:
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<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(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 boost::shared_ptr<PlayerInterface> createPlayer(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); virtual std::vector<boost::shared_ptr<BeRoInterface> > createBeRo(HandInterface *hi, int id, unsigned dP, int sB);
private: private:
src/engine/local_engine/localplayer.cpp
+13 -13
View File
@@ -849,8 +849,8 @@ static const RoundData FlopValues[] =
#define NUM_PREFLOP_VALUES (sizeof(PreflopValues)/sizeof(RoundData)) #define NUM_PREFLOP_VALUES (sizeof(PreflopValues)/sizeof(RoundData))
#define NUM_FLOP_VALUES (sizeof(FlopValues)/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) 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), 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) : 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 !!!!!!!!!!!!!!!!!!!!!!!! // !!!!!!!!!!!!!!!!!!!!!!!! testing !!!!!!!!!!!!!!!!!!!!!!!!
@@ -1012,7 +1012,7 @@ void LocalPlayer::action() {
if(myConfig->readConfigInt("EngineVersion")) preflopEngine3(); if(myConfig->readConfigInt("EngineVersion")) preflopEngine3();
else preflopEngine(); else preflopEngine();
currentBoard->collectSets(); currentHand->getBoard()->collectSets();
currentHand->getGuiInterface()->refreshPot(); currentHand->getGuiInterface()->refreshPot();
} break; } break;
@@ -1021,7 +1021,7 @@ void LocalPlayer::action() {
if(myConfig->readConfigInt("EngineVersion")) flopEngine3(); if(myConfig->readConfigInt("EngineVersion")) flopEngine3();
else flopEngine(); else flopEngine();
currentBoard->collectSets(); currentHand->getBoard()->collectSets();
currentHand->getGuiInterface()->refreshPot(); currentHand->getGuiInterface()->refreshPot();
} break; } break;
@@ -1030,7 +1030,7 @@ void LocalPlayer::action() {
if(myConfig->readConfigInt("EngineVersion")) turnEngine3(); if(myConfig->readConfigInt("EngineVersion")) turnEngine3();
else turnEngine(); else turnEngine();
currentBoard->collectSets(); currentHand->getBoard()->collectSets();
currentHand->getGuiInterface()->refreshPot(); currentHand->getGuiInterface()->refreshPot();
} break; } break;
@@ -1039,7 +1039,7 @@ void LocalPlayer::action() {
if(myConfig->readConfigInt("EngineVersion")) riverEngine3(); if(myConfig->readConfigInt("EngineVersion")) riverEngine3();
else riverEngine(); else riverEngine();
currentBoard->collectSets(); currentHand->getBoard()->collectSets();
currentHand->getGuiInterface()->refreshPot(); currentHand->getGuiInterface()->refreshPot();
} break; } break;
@@ -4010,7 +4010,7 @@ void LocalPlayer::calcMyOdds() {
int i; int i;
for(i=0; i<2; i++) tempArray[i] = myCards[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]; for(i=0; i<3; i++) tempArray[2+i] = boardCards[i];
// cout << myID << ": "; // cout << myID << ": ";
@@ -4055,7 +4055,7 @@ void LocalPlayer::calcMyOdds() {
int tempBoardCardsArray[5]; int tempBoardCardsArray[5];
int tempMyCardsArray[7]; int tempMyCardsArray[7];
int tempOpponentCardsArray[7]; int tempOpponentCardsArray[7];
currentBoard->getMyCards(tempBoardCardsArray); currentHand->getBoard()->getMyCards(tempBoardCardsArray);
tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[0] = myCards[0];
tempMyCardsArray[1] = myCards[1]; tempMyCardsArray[1] = myCards[1];
@@ -4111,7 +4111,7 @@ void LocalPlayer::calcMyOdds() {
int tempBoardCardsArray[5]; int tempBoardCardsArray[5];
int tempMyCardsArray[7]; int tempMyCardsArray[7];
int tempOpponentCardsArray[7]; int tempOpponentCardsArray[7];
currentBoard->getMyCards(tempBoardCardsArray); currentHand->getBoard()->getMyCards(tempBoardCardsArray);
tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[0] = myCards[0];
tempMyCardsArray[1] = myCards[1]; tempMyCardsArray[1] = myCards[1];
@@ -4609,7 +4609,7 @@ void LocalPlayer::flopEngine3() {
int tempBoardCardsArray[5]; int tempBoardCardsArray[5];
int tempMyCardsArray[7]; int tempMyCardsArray[7];
int tempOpponentCardsArray[7]; int tempOpponentCardsArray[7];
currentBoard->getMyCards(tempBoardCardsArray); currentHand->getBoard()->getMyCards(tempBoardCardsArray);
tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[0] = myCards[0];
tempMyCardsArray[1] = myCards[1]; tempMyCardsArray[1] = myCards[1];
@@ -4780,7 +4780,7 @@ void LocalPlayer::turnEngine3() {
int tempBoardCardsArray[5]; int tempBoardCardsArray[5];
int tempMyCardsArray[7]; int tempMyCardsArray[7];
int tempOpponentCardsArray[7]; int tempOpponentCardsArray[7];
currentBoard->getMyCards(tempBoardCardsArray); currentHand->getBoard()->getMyCards(tempBoardCardsArray);
tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[0] = myCards[0];
tempMyCardsArray[1] = myCards[1]; tempMyCardsArray[1] = myCards[1];
@@ -4946,7 +4946,7 @@ void LocalPlayer::riverEngine3() {
int tempBoardCardsArray[5]; int tempBoardCardsArray[5];
int tempMyCardsArray[7]; int tempMyCardsArray[7];
int tempOpponentCardsArray[7]; int tempOpponentCardsArray[7];
currentBoard->getMyCards(tempBoardCardsArray); currentHand->getBoard()->getMyCards(tempBoardCardsArray);
tempMyCardsArray[0] = myCards[0]; tempMyCardsArray[0] = myCards[0];
tempMyCardsArray[1] = myCards[1]; tempMyCardsArray[1] = myCards[1];
@@ -5130,7 +5130,7 @@ LocalPlayer::resetActionTimeoutCounter()
bool LocalPlayer::checkIfINeedToShowCards() bool LocalPlayer::checkIfINeedToShowCards()
{ {
std::list<unsigned> playerNeedToShowCardsList = currentBoard->getPlayerNeedToShowCards(); std::list<unsigned> playerNeedToShowCardsList = currentHand->getBoard()->getPlayerNeedToShowCards();
for(std::list<unsigned>::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); it++) for(std::list<unsigned>::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); it++)
{ {
if(*it == myUniqueID) return true; if(*it == myUniqueID) return true;
src/engine/local_engine/localplayer.h
+1 -3
View File
@@ -29,11 +29,10 @@
class CardsValue; class CardsValue;
class ConfigFile; class ConfigFile;
class HandInterface; class HandInterface;
class BoardInterface;
class LocalPlayer : public PlayerInterface{ class LocalPlayer : public PlayerInterface{
public: 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(); ~LocalPlayer();
@@ -189,7 +188,6 @@ private:
ConfigFile *myConfig; ConfigFile *myConfig;
HandInterface *currentHand; HandInterface *currentHand;
BoardInterface *currentBoard;
CardsValue *myCardsValue; CardsValue *myCardsValue;
src/engine/network_engine/clientenginefactory.cpp
+2 -2
View File
@@ -48,9 +48,9 @@ ClientEngineFactory::createBoard(unsigned dp)
} }
boost::shared_ptr<PlayerInterface> 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) ClientEngineFactory::createPlayer(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, id, uniqueId, type, name, avatar, sC, aS, mB));
} }
std::vector<boost::shared_ptr<BeRoInterface> > std::vector<boost::shared_ptr<BeRoInterface> >
src/engine/network_engine/clientenginefactory.h
+1 -1
View File
@@ -40,7 +40,7 @@ public:
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<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(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 boost::shared_ptr<PlayerInterface> createPlayer(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); virtual std::vector<boost::shared_ptr<BeRoInterface> > createBeRo(HandInterface *hi, int id, unsigned dP, int sB);
}; };
src/engine/network_engine/clientplayer.cpp
+3 -3
View File
@@ -22,8 +22,8 @@
using namespace std; 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) 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), currentBoard(b), myCardsValue(0), myID(id), myUniqueID(uniqueId), myType(type), : 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), 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), myAction(0), myButton(mB), myActiveStatus(aS), myStayOnTableStatus(true), myTurn(false), myCardsFlip(false), myRoundStartCash(0),
lastMoneyWon(0), sBluff(0), sBluffStatus(false), myWinnerState(false) lastMoneyWon(0), sBluff(0), sBluffStatus(false), myWinnerState(false)
@@ -526,7 +526,7 @@ boost::shared_ptr<SessionData> ClientPlayer::getNetSessionData()
bool ClientPlayer::checkIfINeedToShowCards() bool ClientPlayer::checkIfINeedToShowCards()
{ {
boost::recursive_mutex::scoped_lock lock(m_syncMutex); boost::recursive_mutex::scoped_lock lock(m_syncMutex);
std::list<unsigned> playerNeedToShowCardsList = currentBoard->getPlayerNeedToShowCards(); std::list<unsigned> playerNeedToShowCardsList = currentHand->getBoard()->getPlayerNeedToShowCards();
for(std::list<unsigned>::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); it++) for(std::list<unsigned>::iterator it = playerNeedToShowCardsList.begin(); it != playerNeedToShowCardsList.end(); it++)
{ {
if(*it == myUniqueID) return true; if(*it == myUniqueID) return true;
src/engine/network_engine/clientplayer.h
+1 -3
View File
@@ -28,11 +28,10 @@
class CardsValue; class CardsValue;
class ConfigFile; class ConfigFile;
class HandInterface; class HandInterface;
class BoardInterface;
class ClientPlayer : public PlayerInterface{ class ClientPlayer : public PlayerInterface{
public: 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(); ~ClientPlayer();
void setHand(HandInterface *); void setHand(HandInterface *);
@@ -146,7 +145,6 @@ private:
ConfigFile *myConfig; ConfigFile *myConfig;
HandInterface *currentHand; HandInterface *currentHand;
BoardInterface *currentBoard;
CardsValue *myCardsValue; CardsValue *myCardsValue;
src/game.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ Game::Game(GuiInterface* gui, boost::shared_ptr<EngineFactory> factory,
} }
// create player objects // create player objects
boost::shared_ptr<PlayerInterface> tmpPlayer = myFactory->createPlayer(currentBoard.get(), i, uniqueId, type, myName, myAvatarFile, startCash, startQuantityPlayers > i, 0); boost::shared_ptr<PlayerInterface> tmpPlayer = myFactory->createPlayer(i, uniqueId, type, myName, myAvatarFile, startCash, startQuantityPlayers > i, 0);
tmpPlayer->setNetSessionData(myNetSession); tmpPlayer->setNetSessionData(myNetSession);