From 1f21fe815e3fb63a3a04ce200f1677abc65ee769 Mon Sep 17 00:00:00 2001 From: doitux Date: Wed, 26 Sep 2007 19:45:58 +0000 Subject: [PATCH] adds activePlayerList and runningPlayerList (XIV) - !!! BROKEN !!! - last sable rev866 --- src/engine/enginefactory.h | 2 +- src/engine/handinterface.h | 3 + src/engine/local_engine/localbero.cpp | 33 +++- src/engine/local_engine/localbero.h | 30 +++- src/engine/local_engine/localberoflop.cpp | 2 +- src/engine/local_engine/localberoflop.h | 2 +- src/engine/local_engine/localberopreflop.cpp | 163 ++++++++++++------ src/engine/local_engine/localberopreflop.h | 6 +- src/engine/local_engine/localberoriver.cpp | 2 +- src/engine/local_engine/localberoriver.h | 2 +- src/engine/local_engine/localberoturn.cpp | 2 +- src/engine/local_engine/localberoturn.h | 2 +- .../local_engine/localenginefactory.cpp | 2 +- src/engine/local_engine/localenginefactory.h | 2 +- src/engine/local_engine/localhand.cpp | 30 +++- src/engine/local_engine/localhand.h | 7 +- src/engine/network_engine/clientbero.cpp | 2 +- src/engine/network_engine/clientbero.h | 2 +- .../network_engine/clientenginefactory.cpp | 2 +- .../network_engine/clientenginefactory.h | 2 +- src/engine/network_engine/clienthand.cpp | 28 +++ src/engine/network_engine/clienthand.h | 3 + src/game.h | 2 +- 23 files changed, 252 insertions(+), 79 deletions(-) diff --git a/src/engine/enginefactory.h b/src/engine/enginefactory.h index e0dba9da..7f98a3a7 100644 --- a/src/engine/enginefactory.h +++ b/src/engine/enginefactory.h @@ -36,7 +36,7 @@ public: virtual HandInterface* createHand(boost::shared_ptr f, GuiInterface *g, BoardInterface *b, std::vector > sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC) =0; virtual BoardInterface* createBoard() =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 std::vector > createBeRo(HandInterface* hi, int id, int dP, int sB) =0; + virtual std::vector > createBeRo(HandInterface* hi, int id, unsigned dP, int sB) =0; }; #endif diff --git a/src/engine/handinterface.h b/src/engine/handinterface.h index 55fa232b..04fb534f 100644 --- a/src/engine/handinterface.h +++ b/src/engine/handinterface.h @@ -40,6 +40,9 @@ public: virtual PlayerList getActivePlayerList() const =0; virtual PlayerList getRunningPlayerList() const =0; + virtual PlayerListIterator getActivePlayerIt(unsigned) const =0; + virtual PlayerListIterator getRunningPlayerIt(unsigned) const =0; + virtual BoardInterface* getBoard() const =0; virtual boost::shared_ptr getPreflop() const =0; virtual boost::shared_ptr getFlop() const =0; diff --git a/src/engine/local_engine/localbero.cpp b/src/engine/local_engine/localbero.cpp index 4a206c68..c0a5b0c2 100644 --- a/src/engine/local_engine/localbero.cpp +++ b/src/engine/local_engine/localbero.cpp @@ -13,12 +13,36 @@ using namespace std; -LocalBeRo::LocalBeRo(HandInterface* hi, int id, int dP, int sB, GameState gS) -: BeRoInterface(), myHand(hi), myBeRoID(gS), myID(id), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(false), minimumRaise(2*sB), firstRun(true), firstRound(true), firstHeadsUpRound(true), currentPlayersTurn(0), firstRoundLastPlayersTurn(0), logBoardCardsDone(false) +LocalBeRo::LocalBeRo(HandInterface* hi, int id, unsigned dP, int sB, GameState gS) +: BeRoInterface(), myHand(hi), myBeRoID(gS), myID(id), dealerPosition(dP), smallBlindPosition(0), dealerPositionId(dP), smallBlindPositionId(0), bigBlindPositionId(0), smallBlind(sB), highestSet(false), minimumRaise(2*sB), firstRun(true), firstRound(true), firstHeadsUpRound(true), currentPlayersTurnId(0), firstRoundLastPlayersTurnId(0), logBoardCardsDone(false) { currentPlayersTurnIt = myHand->getRunningPlayerList()->begin(); lastPlayersTurnIt = myHand->getRunningPlayerList()->begin(); + PlayerListConstIterator it_c; + + // determine bigBlindPosition + for(it_c=myHand->getActivePlayerList()->begin(); it_c!=myHand->getActivePlayerList()->end(); it_c++) { + if((*it_c)->getMyButton() == BUTTON_BIG_BLIND) { + bigBlindPositionId = (*it_c)->getMyUniqueID(); + break; + } + } + assert(it_c!=myHand->getActivePlayerList()->end()); + + // determine smallBlindPosition + for(it_c=myHand->getActivePlayerList()->begin(); it_c!=myHand->getActivePlayerList()->end(); it_c++) { + if((*it_c)->getMyButton() == BUTTON_SMALL_BLIND) { + smallBlindPositionId = (*it_c)->getMyUniqueID(); + break; + } + } + assert(it_c!=myHand->getActivePlayerList()->end()); + + + + + // int i; //SmallBlind-Position ermitteln @@ -40,7 +64,10 @@ void LocalBeRo::nextPlayer() { // cout << "playerID in nextPlayer(): " << (*currentPlayersTurnIt)->getMyID() << endl; - (*currentPlayersTurnIt)->action(); + PlayerListConstIterator currentPlayersTurnConstIt = myHand->getRunningPlayerIt(currentPlayersTurnId); + assert( currentPlayersTurnConstIt != myHand->getRunningPlayerList()->end() ); + + (*currentPlayersTurnConstIt)->action(); } diff --git a/src/engine/local_engine/localbero.h b/src/engine/local_engine/localbero.h index e268507b..ab6cfb07 100644 --- a/src/engine/local_engine/localbero.h +++ b/src/engine/local_engine/localbero.h @@ -24,7 +24,7 @@ */ class LocalBeRo : public BeRoInterface{ public: - LocalBeRo(HandInterface* hi, int id, int dP, int sB, GameState gS); + LocalBeRo(HandInterface* hi, int id, unsigned dP, int sB, GameState gS); ~LocalBeRo(); GameState getMyBeRoID() const { return myBeRoID; } @@ -53,11 +53,11 @@ protected: void setPlayersTurn(int theValue) { playersTurn = theValue; } int getPlayersTurn() const { return playersTurn;} - void setCurrentPlayersTurn(unsigned theValue) { currentPlayersTurn = theValue; } - unsigned getCurrentPlayersTurn() const { return currentPlayersTurn;} + void setCurrentPlayersTurnId(unsigned theValue) { currentPlayersTurnId = theValue; } + unsigned getCurrentPlayersTurnId() const { return currentPlayersTurnId;} - void setFirstRoundLastPlayersTurn(unsigned theValue) { firstRoundLastPlayersTurn = theValue; } - unsigned getFirstRoundLastPlayersTurn() const { return firstRoundLastPlayersTurn;} + void setFirstRoundLastPlayersTurnId(unsigned theValue) { firstRoundLastPlayersTurnId = theValue; } + unsigned getFirstRoundLastPlayersTurnId() const { return firstRoundLastPlayersTurnId;} void setCurrentPlayersTurnIt(PlayerListIterator theValue) { currentPlayersTurnIt = theValue; } PlayerListIterator getCurrentPlayersTurnIt() const { return currentPlayersTurnIt; } @@ -71,6 +71,17 @@ protected: void setFirstRound(bool theValue) { firstRound = theValue;} bool getFirstRound() const { return firstRound;} + + void setDealerPositionId(unsigned theValue) { dealerPositionId = theValue;} + unsigned getDealerPositionId() const { return dealerPositionId; } + + void setSmallBlindPositionId(unsigned theValue) { smallBlindPositionId = theValue;} + unsigned getSmallBlindPositionId() const { return smallBlindPositionId; } + + void setBigBlindPositionId(unsigned theValue) { bigBlindPositionId = theValue;} + unsigned getBigBlindPositionId() const { return bigBlindPositionId; } + + void setSmallBlindPosition(int theValue) { smallBlindPosition = theValue;} int getSmallBlindPosition() const { return smallBlindPosition; } @@ -92,6 +103,11 @@ private: int dealerPosition; int smallBlindPosition; + unsigned dealerPositionId; + unsigned smallBlindPositionId; + unsigned bigBlindPositionId; + + int smallBlind; int highestSet; int minimumRaise; @@ -104,8 +120,8 @@ private: PlayerListIterator currentPlayersTurnIt; // iterator for runningPlayerList PlayerListIterator lastPlayersTurnIt; // iterator for runningPlayerList - unsigned currentPlayersTurn; - unsigned firstRoundLastPlayersTurn; + unsigned currentPlayersTurnId; + unsigned firstRoundLastPlayersTurnId; bool logBoardCardsDone; diff --git a/src/engine/local_engine/localberoflop.cpp b/src/engine/local_engine/localberoflop.cpp index 53dda8d8..46c48206 100644 --- a/src/engine/local_engine/localberoflop.cpp +++ b/src/engine/local_engine/localberoflop.cpp @@ -24,7 +24,7 @@ using namespace std; -LocalBeRoFlop::LocalBeRoFlop(HandInterface* hi, int id, int dP, int sB) : LocalBeRo(hi, id, dP, sB, GAME_STATE_FLOP) +LocalBeRoFlop::LocalBeRoFlop(HandInterface* hi, int id, unsigned dP, int sB) : LocalBeRo(hi, id, dP, sB, GAME_STATE_FLOP) { } diff --git a/src/engine/local_engine/localberoflop.h b/src/engine/local_engine/localberoflop.h index 3b7eeee9..9a1cc5af 100644 --- a/src/engine/local_engine/localberoflop.h +++ b/src/engine/local_engine/localberoflop.h @@ -28,7 +28,7 @@ class HandInterface; class LocalBeRoFlop : public LocalBeRo{ public: - LocalBeRoFlop(HandInterface*, int, int, int); + LocalBeRoFlop(HandInterface*, int, unsigned, int); ~LocalBeRoFlop(); }; diff --git a/src/engine/local_engine/localberopreflop.cpp b/src/engine/local_engine/localberopreflop.cpp index 522a241e..0b56eccd 100644 --- a/src/engine/local_engine/localberopreflop.cpp +++ b/src/engine/local_engine/localberopreflop.cpp @@ -24,70 +24,93 @@ using namespace std; -LocalBeRoPreflop::LocalBeRoPreflop(HandInterface* hi, int id, int dP, int sB) : LocalBeRo(hi, id, dP, sB, GAME_STATE_PREFLOP), bigBlindPosition(0) +LocalBeRoPreflop::LocalBeRoPreflop(HandInterface* hi, int id, unsigned dP, int sB) : LocalBeRo(hi, id, dP, sB, GAME_STATE_PREFLOP) { - PlayerListConstIterator it_c; +// PlayerListConstIterator it_c; setHighestSet(2*getSmallBlind()); - // determine bigBlindPosition - for(bigBlindPositionIt=getMyHand()->getActivePlayerList()->begin(); bigBlindPositionIt!=getMyHand()->getActivePlayerList()->end(); bigBlindPositionIt++) { - if((*bigBlindPositionIt)->getMyButton() == BUTTON_BIG_BLIND) break; - } + // determine bigBlindPosition -> old: delete +// for(bigBlindPositionIt=getMyHand()->getActivePlayerList()->begin(); bigBlindPositionIt!=getMyHand()->getActivePlayerList()->end(); bigBlindPositionIt++) { +// if((*bigBlindPositionIt)->getMyButton() == BUTTON_BIG_BLIND) break; +// } - for(it_c=getMyHand()->getActivePlayerList()->begin(); it_c!=getMyHand()->getActivePlayerList()->end(); it_c++) { - if((*it_c)->getMyButton() == BUTTON_BIG_BLIND) { - bigBlindPosition = (*it_c)->getMyUniqueID(); - break; - }; - } // search player in runningPlayerList before first action player -> run() determine next player who will do first action - PlayerListIterator it_1, it_2, it_3; +// PlayerListIterator it_1, it_2, it_3; + PlayerListIterator it; + + // search bigBlindPosition in runningPlayerList -> old: delete +// it_1 = find(getMyHand()->getRunningPlayerList()->begin(), getMyHand()->getRunningPlayerList()->end(), *bigBlindPositionIt); // search bigBlindPosition in runningPlayerList - it_1 = find(getMyHand()->getRunningPlayerList()->begin(), getMyHand()->getRunningPlayerList()->end(), *bigBlindPositionIt); + PlayerListIterator bigBlindPositionIt = getMyHand()->getRunningPlayerIt(getBigBlindPositionId()); // more than 2 players are still active -> runningPlayerList is not empty if(getMyHand()->getActivePlayerList()->size() > 2) { // bigBlindPlayer not found in runningPlayerList (he is all in) -> bigBlindPlayer is not the running player before first action player - if(it_1 == getMyHand()->getRunningPlayerList()->end()) { + if(bigBlindPositionIt == getMyHand()->getRunningPlayerList()->end()) { // search smallBlindPosition in runningPlayerList - PlayerListIterator smallBlindPositionIt = bigBlindPositionIt; - if(smallBlindPositionIt == getMyHand()->getActivePlayerList()->begin()) smallBlindPositionIt = getMyHand()->getActivePlayerList()->end(); - smallBlindPositionIt--; - it_2 = find(getMyHand()->getRunningPlayerList()->begin(), getMyHand()->getRunningPlayerList()->end(), *smallBlindPositionIt); + PlayerListIterator smallBlindPositionIt = getMyHand()->getRunningPlayerIt(getSmallBlindPositionId()); +// if(smallBlindPositionIt == getMyHand()->getActivePlayerList()->begin()) smallBlindPositionIt = getMyHand()->getActivePlayerList()->end(); +// smallBlindPositionIt--; +// it_2 = find(getMyHand()->getRunningPlayerList()->begin(), getMyHand()->getRunningPlayerList()->end(), *smallBlindPositionIt); // smallBlindPlayer not found in runningPlayerList (he is all in) -> next active player before smallBlindPlayer is running player before first action player - if(it_2 == getMyHand()->getRunningPlayerList()->end()) { - it_2 = smallBlindPositionIt; - if(it_2 == getMyHand()->getActivePlayerList()->begin()) it_2 = getMyHand()->getActivePlayerList()->end(); - it_2--; - it_3 = find(getMyHand()->getRunningPlayerList()->begin(), getMyHand()->getRunningPlayerList()->end(), *it_2); - if(it_3 == getMyHand()->getRunningPlayerList()->end()) { - cout << "ERROR - lastPlayersTurnIt-detection in localBeRoPreflop" << endl; - } else { - setLastPlayersTurnIt(it_3); - } + if(smallBlindPositionIt == getMyHand()->getRunningPlayerList()->end()) { + + it = getMyHand()->getActivePlayerIt(getSmallBlindPositionId()); + assert(it != getMyHand()->getActivePlayerList()->end()); + + if(it == getMyHand()->getActivePlayerList()->begin()) it = getMyHand()->getActivePlayerList()->end(); + it--; + + setFirstRoundLastPlayersTurnId( (*it)->getMyUniqueID() ); + + +// it_3 = find(getMyHand()->getRunningPlayerList()->begin(), getMyHand()->getRunningPlayerList()->end(), *it_2); +// if(it_3 == getMyHand()->getRunningPlayerList()->end()) { +// cout << "ERROR - lastPlayersTurnIt-detection in localBeRoPreflop" << endl; +// } else { +// setLastPlayersTurnIt(it_3); +// } } // smallBlindPlayer found in runningPlayerList -> running player before first action player else { - setLastPlayersTurnIt(it_2); + setFirstRoundLastPlayersTurnId( getSmallBlindPositionId() ); } } // bigBlindPlayer found in runningPlayerList -> player before first action player else { - setLastPlayersTurnIt(it_1); + setFirstRoundLastPlayersTurnId( getBigBlindPositionId() ); } } // heads up -> dealer/smallBlindPlayer is first action player and bigBlindPlayer is player before else { - setLastPlayersTurnIt(it_1); + + // bigBlindPlayer not found in runningPlayerList (he is all in) -> only smallBlind has to choose fold or call the bigBlindAmount + if(bigBlindPositionIt == getMyHand()->getRunningPlayerList()->end()) { + + // search smallBlindPosition in runningPlayerList + PlayerListIterator smallBlindPositionIt = getMyHand()->getRunningPlayerIt(getSmallBlindPositionId()); + + // smallBlindPlayer not found in runningPlayerList (he is all in) -> no running player -> showdown and no firstRoundLastPlayersTurnId is used + if(smallBlindPositionIt == getMyHand()->getRunningPlayerList()->end()) { + + } + // smallBlindPlayer found in runningPlayerList -> running player before first action player (himself) + else { + setFirstRoundLastPlayersTurnId( getSmallBlindPositionId() ); + } + + + } + setFirstRoundLastPlayersTurnId( getBigBlindPositionId() ); } - setCurrentPlayersTurnIt(getLastPlayersTurnIt()); + setCurrentPlayersTurnId( getFirstRoundLastPlayersTurnId() ); // cout << "playerID constructor beropreflop: " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; @@ -97,7 +120,7 @@ LocalBeRoPreflop::LocalBeRoPreflop(HandInterface* hi, int id, int dP, int sB) : - it_1 = find(getMyHand()->getRunningPlayerList()->begin(), getMyHand()->getRunningPlayerList()->end(), *bigBlindPositionIt); +// it_1 = find(getMyHand()->getRunningPlayerList()->begin(), getMyHand()->getRunningPlayerList()->end(), *bigBlindPositionIt); // bigBlindPosition is not all in // if(it!=getMyHand()->getRunningPlayerList()->end()) { @@ -142,13 +165,14 @@ void LocalBeRoPreflop::run() { int i; bool allHighestSet = true; - PlayerListIterator it; +// PlayerListIterator it; + PlayerListConstIterator it_c; // test if all running players have same sets (else allHighestSet = false) - for(it=getMyHand()->getRunningPlayerList()->begin(); it!=getMyHand()->getRunningPlayerList()->end(); it++) { - if(getHighestSet() != (*it)->getMySet()) { + for(it_c=getMyHand()->getRunningPlayerList()->begin(); it_c!=getMyHand()->getRunningPlayerList()->end(); it_c++) { + if(getHighestSet() != (*it_c)->getMySet()) { allHighestSet = false; } } @@ -157,26 +181,59 @@ void LocalBeRoPreflop::run() { // cout << "playerID begin preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; - it = getCurrentPlayersTurnIt(); +// it++; - it++; + PlayerListIterator currentPlayersTurnIt = getMyHand()->getRunningPlayerIt( getCurrentPlayersTurnId() ); + assert( currentPlayersTurnIt != getMyHand()->getRunningPlayerList()->end() ); - setCurrentPlayersTurnIt(it); + currentPlayersTurnIt++; + if(currentPlayersTurnIt == getMyHand()->getRunningPlayerList()->end()) currentPlayersTurnIt = getMyHand()->getRunningPlayerList()->begin(); - if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) setCurrentPlayersTurnIt(getMyHand()->getRunningPlayerList()->begin()); + setCurrentPlayersTurnId( (*currentPlayersTurnIt)->getMyUniqueID() ); + +// setCurrentPlayersTurnIt(++getCurrentPlayersTurnIt()); +// if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) setCurrentPlayersTurnIt(getMyHand()->getRunningPlayerList()->begin()); // if(getCurrentPlayersTurnIt() == getMyHand()->getRunningPlayerList()->end()) cout << "!!!" << endl; // cout << "playerID middle preflopRun(): " << (*(getCurrentPlayersTurnIt()))->getMyID() << endl; + + + + + + + + // exceptions // if next player is small blind and only all-in-big-blind with less than smallblind amount is nonfold too -> preflop is over - if((*(getCurrentPlayersTurnIt()))->getMyButton() == BUTTON_SMALL_BLIND && (*bigBlindPositionIt)->getMySet() <= getSmallBlind() && getMyHand()->getRunningPlayerList()->size() == 1) { + PlayerListConstIterator bigBlindPositionIt = getMyHand()->getActivePlayerIt(getBigBlindPositionId()); + assert(bigBlindPositionIt != getMyHand()->getActivePlayerList()->end()); + + PlayerListConstIterator currentPlayersTurnConstIt = getMyHand()->getRunningPlayerIt( getCurrentPlayersTurnId() ); + assert(currentPlayersTurnConstIt != getMyHand()->getRunningPlayerList()->end()); + + if((*currentPlayersTurnConstIt)->getMyButton() == BUTTON_SMALL_BLIND && (*bigBlindPositionIt)->getMySet() <= getSmallBlind() && getMyHand()->getRunningPlayerList()->size() == 1) { setFirstRound(false); allHighestSet = true; } + + + + + + + + + + + + + + // determine next player // for(i=0; (igetPlayerArray()[getPlayersTurn()]->getMyActiveStatus()) || getMyHand()->getPlayerArray()[getPlayersTurn()]->getMyAction() == PLAYER_ACTION_FOLD || getMyHand()->getPlayerArray()[getPlayersTurn()]->getMyAction() == PLAYER_ACTION_ALLIN)) || i==0; i++) { // @@ -198,8 +255,8 @@ void LocalBeRoPreflop::run() { getMyHand()->setActualRound(GAME_STATE_FLOP); //Action loeschen und ActionButtons refresh - for(it=getMyHand()->getRunningPlayerList()->begin(); it!=getMyHand()->getRunningPlayerList()->end(); it++) { - (*it)->setMyAction(PLAYER_ACTION_NONE); + for(it_c=getMyHand()->getRunningPlayerList()->begin(); it_c!=getMyHand()->getRunningPlayerList()->end(); it_c++) { + (*it_c)->setMyAction(PLAYER_ACTION_NONE); } //Action loeschen und ActionButtons refresh @@ -225,24 +282,32 @@ void LocalBeRoPreflop::run() { // if(getMyHand()->getPlayerArray()[getPlayersTurn()]->getMyButton() == BUTTON_BIG_BLIND) setFirstRound(0); // lastPlayersTurn -> PreflopFirstRound is over - if( (*(getCurrentPlayersTurnIt())) == (*(getLastPlayersTurnIt())) ) { +// if( (*(getCurrentPlayersTurnIt())) == (*(getLastPlayersTurnIt())) ) { +// setFirstRound(false); +// } + + // lastPlayersTurn -> PreflopFirstRound is over + if( getCurrentPlayersTurnId() == getFirstRoundLastPlayersTurnId() ) { setFirstRound(false); } + // getMyHand()->getPlayerArray()[getPlayersTurn()]->setMyTurn(1); - (*(getCurrentPlayersTurnIt()))->setMyTurn(true); + (*currentPlayersTurnConstIt)->setMyTurn(true); + +// (*(getCurrentPlayersTurnIt()))->setMyTurn(true); //highlight active players groupbox and clear action // getMyHand()->getGuiInterface()->refreshGroupbox(getPlayersTurn(),2); // getMyHand()->getGuiInterface()->refreshAction(getPlayersTurn(),PLAYER_ACTION_NONE); //highlight active players groupbox and clear action - getMyHand()->getGuiInterface()->refreshGroupbox( (*(getCurrentPlayersTurnIt()))->getMyID() , 2 ); - getMyHand()->getGuiInterface()->refreshAction( (*(getCurrentPlayersTurnIt()))->getMyID() , PLAYER_ACTION_NONE ); + getMyHand()->getGuiInterface()->refreshGroupbox( getCurrentPlayersTurnId() , 2 ); + getMyHand()->getGuiInterface()->refreshAction( getCurrentPlayersTurnId() , PLAYER_ACTION_NONE ); - if((*(getCurrentPlayersTurnIt()))->getMyID() == 0) { + if( getCurrentPlayersTurnId() == 0) { // Wir sind dran getMyHand()->getGuiInterface()->meInAction(); } diff --git a/src/engine/local_engine/localberopreflop.h b/src/engine/local_engine/localberopreflop.h index bf4c1a82..79d17baa 100644 --- a/src/engine/local_engine/localberopreflop.h +++ b/src/engine/local_engine/localberopreflop.h @@ -28,14 +28,14 @@ class HandInterface; class LocalBeRoPreflop : public LocalBeRo{ public: - LocalBeRoPreflop(HandInterface*, int, int, int); + LocalBeRoPreflop(HandInterface*, int, unsigned, int); ~LocalBeRoPreflop(); void run(); private: - PlayerListIterator bigBlindPositionIt; // iterator for activePlayerList - unsigned bigBlindPosition; +// PlayerListIterator bigBlindPositionIt; // iterator for activePlayerList +// unsigned bigBlindPositionId; }; #endif diff --git a/src/engine/local_engine/localberoriver.cpp b/src/engine/local_engine/localberoriver.cpp index afcdd850..187fd9ea 100644 --- a/src/engine/local_engine/localberoriver.cpp +++ b/src/engine/local_engine/localberoriver.cpp @@ -25,7 +25,7 @@ using namespace std; -LocalBeRoRiver::LocalBeRoRiver(HandInterface* hi, int id, int dP, int sB) : LocalBeRo(hi, id, dP, sB, GAME_STATE_RIVER) +LocalBeRoRiver::LocalBeRoRiver(HandInterface* hi, int id, unsigned dP, int sB) : LocalBeRo(hi, id, dP, sB, GAME_STATE_RIVER) { } diff --git a/src/engine/local_engine/localberoriver.h b/src/engine/local_engine/localberoriver.h index b6335545..2638b37a 100644 --- a/src/engine/local_engine/localberoriver.h +++ b/src/engine/local_engine/localberoriver.h @@ -28,7 +28,7 @@ class HandInterface; class LocalBeRoRiver : public LocalBeRo{ public: - LocalBeRoRiver(HandInterface*, int, int, int); + LocalBeRoRiver(HandInterface*, int, unsigned, int); ~LocalBeRoRiver(); }; diff --git a/src/engine/local_engine/localberoturn.cpp b/src/engine/local_engine/localberoturn.cpp index de0652b0..afd5cfc2 100644 --- a/src/engine/local_engine/localberoturn.cpp +++ b/src/engine/local_engine/localberoturn.cpp @@ -24,7 +24,7 @@ using namespace std; -LocalBeRoTurn::LocalBeRoTurn(HandInterface* hi, int id, int dP, int sB) : LocalBeRo(hi, id, dP, sB, GAME_STATE_TURN) +LocalBeRoTurn::LocalBeRoTurn(HandInterface* hi, int id, unsigned dP, int sB) : LocalBeRo(hi, id, dP, sB, GAME_STATE_TURN) { } diff --git a/src/engine/local_engine/localberoturn.h b/src/engine/local_engine/localberoturn.h index be87b881..e39aae92 100644 --- a/src/engine/local_engine/localberoturn.h +++ b/src/engine/local_engine/localberoturn.h @@ -27,7 +27,7 @@ class HandInterface; class LocalBeRoTurn : public LocalBeRo{ public: - LocalBeRoTurn(HandInterface*, int, int, int); + LocalBeRoTurn(HandInterface*, int, unsigned, int); ~LocalBeRoTurn(); }; diff --git a/src/engine/local_engine/localenginefactory.cpp b/src/engine/local_engine/localenginefactory.cpp index b3192606..8916e1f4 100644 --- a/src/engine/local_engine/localenginefactory.cpp +++ b/src/engine/local_engine/localenginefactory.cpp @@ -48,7 +48,7 @@ BoardInterface* LocalEngineFactory::createBoard() { return new LocalBoard; } 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) { return boost::shared_ptr (new LocalPlayer(myConfig, b, id, uniqueId, type, name, avatar, sC, aS, mB)); } -std::vector > LocalEngineFactory::createBeRo(HandInterface* hi, int id, int dP, int sB) { +std::vector > LocalEngineFactory::createBeRo(HandInterface* hi, int id, unsigned dP, int sB) { std::vector > myBeRo; diff --git a/src/engine/local_engine/localenginefactory.h b/src/engine/local_engine/localenginefactory.h index fb69887d..74aa07d8 100644 --- a/src/engine/local_engine/localenginefactory.h +++ b/src/engine/local_engine/localenginefactory.h @@ -40,7 +40,7 @@ public: HandInterface* createHand(boost::shared_ptr f, GuiInterface *g, BoardInterface *b, std::vector > sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC); BoardInterface* createBoard(); boost::shared_ptr createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); - std::vector > createBeRo(HandInterface* hi, int id, int dP, int sB); + std::vector > createBeRo(HandInterface* hi, int id, unsigned dP, int sB); private: ConfigFile *myConfig; diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp index ef487fd8..cc37d839 100755 --- a/src/engine/local_engine/localhand.cpp +++ b/src/engine/local_engine/localhand.cpp @@ -26,7 +26,7 @@ using namespace std; -LocalHand::LocalHand(boost::shared_ptr f, GuiInterface *g, BoardInterface *b, std::vector > sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC) +LocalHand::LocalHand(boost::shared_ptr f, GuiInterface *g, BoardInterface *b, std::vector > sl, PlayerList apl, PlayerList rpl, int id, int sP, unsigned dP, int sB,int sC) : myFactory(f), myGui(g), myBoard(b), playerArray(sl), activePlayerList(apl), runningPlayerList(rpl), myBeRo(0), myID(id), startQuantityPlayers(sP), dealerPosition(dP), actualRound(0), smallBlind(sB), startCash(sC), lastPlayersTurn(0), allInCondition(false), cardsShown(false), bettingRoundsPlayed(0) { @@ -495,3 +495,31 @@ void LocalHand::switchRounds() { } } + +PlayerListIterator LocalHand::getActivePlayerIt(unsigned uniqueId) const { + + PlayerListIterator it; + + for(it=activePlayerList->begin(); it!=activePlayerList->end(); it++) { + if((*it)->getMyUniqueID() == uniqueId) { + break; + } + } + + return it; + +} + +PlayerListIterator LocalHand::getRunningPlayerIt(unsigned uniqueId) const { + + PlayerListIterator it; + + for(it=runningPlayerList->begin(); it!=runningPlayerList->end(); it++) { + if((*it)->getMyUniqueID() == uniqueId) { + break; + } + } + + return it; + +} diff --git a/src/engine/local_engine/localhand.h b/src/engine/local_engine/localhand.h index aee884ad..cddc6b19 100755 --- a/src/engine/local_engine/localhand.h +++ b/src/engine/local_engine/localhand.h @@ -34,7 +34,7 @@ class LocalHand : public HandInterface{ public: - LocalHand(boost::shared_ptr f, GuiInterface*, BoardInterface*, std::vector >, PlayerList, PlayerList, int, int, int, int, int); + LocalHand(boost::shared_ptr f, GuiInterface*, BoardInterface*, std::vector >, PlayerList, PlayerList, int, int, unsigned, int, int); ~LocalHand(); void start(); @@ -43,6 +43,9 @@ public: PlayerList getActivePlayerList() const {return activePlayerList;} PlayerList getRunningPlayerList() const {return runningPlayerList;} + PlayerListIterator getActivePlayerIt(unsigned) const; + PlayerListIterator getRunningPlayerIt(unsigned) const; + BoardInterface* getBoard() const { return myBoard; } boost::shared_ptr getPreflop() const { return myBeRo[GAME_STATE_PREFLOP]; } boost::shared_ptr getFlop() const { return myBeRo[GAME_STATE_FLOP]; } @@ -100,7 +103,7 @@ private: int myID; int startQuantityPlayers; - int dealerPosition; // -1 -> neutral + unsigned dealerPosition; // -1 -> neutral int actualRound; //0 = preflop, 1 = flop, 2 = turn, 3 = river int smallBlind; int startCash; diff --git a/src/engine/network_engine/clientbero.cpp b/src/engine/network_engine/clientbero.cpp index 5efd8c6d..7b2ed8a4 100644 --- a/src/engine/network_engine/clientbero.cpp +++ b/src/engine/network_engine/clientbero.cpp @@ -11,7 +11,7 @@ // #include "clientbero.h" -ClientBeRo::ClientBeRo(HandInterface* hi, int /*id*/, int dP, int sB, GameState gS) +ClientBeRo::ClientBeRo(HandInterface* hi, int /*id*/, unsigned dP, int sB, GameState gS) : BeRoInterface(), myBeRoID(gS), myHand(hi), highestCardsValue(0), playersTurn(dP), highestSet(0), firstRound(true), smallBlindPosition(0), smallBlind(sB), minimumRaise(0) { } diff --git a/src/engine/network_engine/clientbero.h b/src/engine/network_engine/clientbero.h index 189e9c63..debdab73 100644 --- a/src/engine/network_engine/clientbero.h +++ b/src/engine/network_engine/clientbero.h @@ -22,7 +22,7 @@ class HandInterface; */ class ClientBeRo : public BeRoInterface{ public: - ClientBeRo(HandInterface* hi, int id, int dP, int sB, GameState gS); + ClientBeRo(HandInterface* hi, int id, unsigned dP, int sB, GameState gS); ~ClientBeRo(); GameState getMyBeRoID() const; diff --git a/src/engine/network_engine/clientenginefactory.cpp b/src/engine/network_engine/clientenginefactory.cpp index ac4da6c1..ff0de32e 100644 --- a/src/engine/network_engine/clientenginefactory.cpp +++ b/src/engine/network_engine/clientenginefactory.cpp @@ -50,7 +50,7 @@ boost::shared_ptr ClientEngineFactory::createPlayer(BoardInter return boost::shared_ptr (new ClientPlayer(NULL, b, id, uniqueId, type, name, avatar, sC, aS, mB)); } -std::vector > ClientEngineFactory::createBeRo(HandInterface* hi, int id, int dP, int sB) { +std::vector > ClientEngineFactory::createBeRo(HandInterface* hi, int id, unsigned dP, int sB) { std::vector > myBeRo; diff --git a/src/engine/network_engine/clientenginefactory.h b/src/engine/network_engine/clientenginefactory.h index f02a7251..8e90fd72 100644 --- a/src/engine/network_engine/clientenginefactory.h +++ b/src/engine/network_engine/clientenginefactory.h @@ -40,7 +40,7 @@ public: HandInterface* createHand(boost::shared_ptr f, GuiInterface *g, BoardInterface *b, std::vector > sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC); BoardInterface* createBoard(); boost::shared_ptr createPlayer(BoardInterface *b, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); - std::vector > createBeRo(HandInterface* hi, int id, int dP, int sB); + std::vector > createBeRo(HandInterface* hi, int id, unsigned dP, int sB); }; diff --git a/src/engine/network_engine/clienthand.cpp b/src/engine/network_engine/clienthand.cpp index 7753af9f..e90037bd 100644 --- a/src/engine/network_engine/clienthand.cpp +++ b/src/engine/network_engine/clienthand.cpp @@ -76,6 +76,34 @@ ClientHand::getPlayerArray() const return playerArray; } +PlayerListIterator +ClientHand::getActivePlayerIt(unsigned uniqueId) const +{ + PlayerListIterator it; + + for(it=activePlayerList->begin(); it!=activePlayerList->end(); it++) { + if((*it)->getMyUniqueID() == uniqueId) { + break; + } + } + + return it; +} + +PlayerListIterator +ClientHand::getRunningPlayerIt(unsigned uniqueId) const +{ + PlayerListIterator it; + + for(it=runningPlayerList->begin(); it!=runningPlayerList->end(); it++) { + if((*it)->getMyUniqueID() == uniqueId) { + break; + } + } + + return it; +} + BoardInterface* ClientHand::getBoard() const { diff --git a/src/engine/network_engine/clienthand.h b/src/engine/network_engine/clienthand.h index 8bc37141..ff81f71e 100644 --- a/src/engine/network_engine/clienthand.h +++ b/src/engine/network_engine/clienthand.h @@ -41,6 +41,9 @@ class ClientHand : public HandInterface PlayerList getActivePlayerList() const {return activePlayerList;} PlayerList getRunningPlayerList() const {return runningPlayerList;} + PlayerListIterator getActivePlayerIt(unsigned) const; + PlayerListIterator getRunningPlayerIt(unsigned) const; + BoardInterface* getBoard() const; boost::shared_ptr getPreflop() const; boost::shared_ptr getFlop() const; diff --git a/src/game.h b/src/game.h index 408780f0..af1d3d3a 100755 --- a/src/game.h +++ b/src/game.h @@ -103,7 +103,7 @@ private: //Laufvariablen int actualSmallBlind; int actualHandID; - int dealerPosition; + unsigned dealerPosition; }; #endif