From c34f683c4176cac756becba7c265a3347b7c46bf Mon Sep 17 00:00:00 2001 From: doitux Date: Tue, 7 Aug 2007 13:07:39 +0000 Subject: [PATCH] BeRo refactoring --- src/engine/berointerface.h | 2 +- src/engine/local_engine/localbero.cpp | 24 +- src/engine/local_engine/localbero.h | 27 +- src/engine/local_engine/localberoflop.cpp | 120 +---- src/engine/local_engine/localberoflop.h | 41 -- .../local_engine/localberopostriver.cpp | 122 +---- src/engine/local_engine/localberopostriver.h | 41 -- src/engine/local_engine/localberopreflop.cpp | 18 +- src/engine/local_engine/localberopreflop.h | 22 - src/engine/local_engine/localberoriver.cpp | 437 +----------------- src/engine/local_engine/localberoriver.h | 47 -- src/engine/local_engine/localberoturn.cpp | 118 +---- src/engine/local_engine/localberoturn.h | 39 -- src/engine/network_engine/clientflop.h | 168 +++---- src/engine/network_engine/clientpreflop.h | 150 +++--- src/engine/network_engine/clientriver.h | 178 +++---- src/engine/network_engine/clientturn.h | 166 +++---- src/gui/generic/serverguiwrapper.cpp | 2 + src/gui/generic/serverguiwrapper.h | 2 + src/gui/guiinterface.h | 2 + src/gui/qt/guiwrapper.cpp | 2 + src/gui/qt/guiwrapper.h | 2 + src/gui/qt/mainwindow/mainwindowimpl.cpp | 28 +- src/gui/qt/mainwindow/mainwindowimpl.h | 4 + 24 files changed, 425 insertions(+), 1337 deletions(-) diff --git a/src/engine/berointerface.h b/src/engine/berointerface.h index 1b7d96ac..98e9699d 100644 --- a/src/engine/berointerface.h +++ b/src/engine/berointerface.h @@ -42,7 +42,7 @@ public: virtual void postRiverRun() =0; - virtual void nextPlayer2() =0; + virtual void nextPlayer() =0; }; diff --git a/src/engine/local_engine/localbero.cpp b/src/engine/local_engine/localbero.cpp index ba99adf3..1ef63589 100644 --- a/src/engine/local_engine/localbero.cpp +++ b/src/engine/local_engine/localbero.cpp @@ -11,17 +11,35 @@ // #include "localbero.h" -LocalBeRo::LocalBeRo(HandInterface* hi, int id, int qP, int dP, int sB) : BeRoInterface(), myHand(hi), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstRun(1), firstRound(1), firstHeadsUpRound(1), playersTurn(dP), logBoardCardsDone(0) +using namespace std; + +LocalBeRo::LocalBeRo(HandInterface* hi, int id, int qP, int dP, int sB, GameState gS) : BeRoInterface(), myHand(hi), myBeRoID(gS), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstRun(1), firstRound(1), firstHeadsUpRound(1), playersTurn(dP), logBoardCardsDone(0) { -} + + int i; + + //SmallBlind-Position ermitteln + for(i=0; igetPlayerArray()[i]->getMyButton() == 2) smallBlindPosition = i; + } + +} LocalBeRo::~LocalBeRo() { } +void LocalBeRo::nextPlayer() { + + myHand->getPlayerArray()[playersTurn]->action(); + +} + void LocalBeRo::run() { + cout << "LocalBeRoRun-" << myBeRoID << endl; + int i; if (firstRun) { @@ -110,7 +128,7 @@ void LocalBeRo::run() { } else { //Gegner sind dran - myHand->getGuiInterface()->flopAnimation2(); + myHand->getGuiInterface()->beRoAnimation2(myBeRoID); } } } diff --git a/src/engine/local_engine/localbero.h b/src/engine/local_engine/localbero.h index 266d75c2..31d0a74e 100644 --- a/src/engine/local_engine/localbero.h +++ b/src/engine/local_engine/localbero.h @@ -12,6 +12,10 @@ #ifndef LOCALBERO_H #define LOCALBERO_H + +#include + +#include "game_defs.h" #include "berointerface.h" #include "handinterface.h" @@ -20,7 +24,7 @@ */ class LocalBeRo : public BeRoInterface{ public: - LocalBeRo(HandInterface* hi, int id, int qP, int dP, int sB); + LocalBeRo(HandInterface* hi, int id, int qP, int dP, int sB, GameState gS); ~LocalBeRo(); @@ -29,6 +33,25 @@ public: int getHighestCardsValue() const {return 0;} void setHighestCardsValue(int theValue) {} + + void setPlayersTurn(int theValue) { playersTurn = theValue; } + int getPlayersTurn() const { return playersTurn; } + + void setHighestSet(int theValue) { highestSet = theValue; } + int getHighestSet() const { return highestSet;} + + void setFirstRound(bool theValue) { firstRound = theValue;} + bool getFirstRound() const { return firstRound;} + + void setSmallBlindPosition(int theValue) { smallBlindPosition = theValue;} + int getSmallBlindPosition() const { return smallBlindPosition; } + + void setSmallBlind(int theValue) { smallBlind = theValue; } + int getSmallBlind() const { return smallBlind; } + + void resetFirstRun() { firstRun = false; } + + void nextPlayer(); void run(); //only until bero refactoring is over @@ -37,8 +60,6 @@ public: void riverRun() {} void turnRun() {} void postRiverRun() {} - - void resetFirstRun() {} protected: diff --git a/src/engine/local_engine/localberoflop.cpp b/src/engine/local_engine/localberoflop.cpp index bf128a6e..ddd1f048 100644 --- a/src/engine/local_engine/localberoflop.cpp +++ b/src/engine/local_engine/localberoflop.cpp @@ -24,130 +24,12 @@ using namespace std; -LocalBeRoFlop::LocalBeRoFlop(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB), myHand(hi), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstFlopRun(1), firstFlopRound(1), firstHeadsUpFlopRound(1), playersTurn(dP), logBoardCardsDone(0) - +LocalBeRoFlop::LocalBeRoFlop(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB, GAME_STATE_FLOP) { - - myBeRoID = GAME_STATE_FLOP; - - int i; - - //SmallBlind-Position ermitteln - for(i=0; igetPlayerArray()[i]->getMyButton() == 2) smallBlindPosition = i; - } - - cout << "LocalBeroFlop erstellt - " << myBeRoID << endl; } - LocalBeRoFlop::~LocalBeRoFlop() { } -void LocalBeRoFlop::run() { - - cout << "LocalBeroFlopRun!!!" << endl; - - int i; - - if (firstFlopRun) { - - myHand->getGuiInterface()->dealFlopCards(); - firstFlopRun = 0; - - } - - else { - //log the turned cards - if(!logBoardCardsDone) { - - int tempBoardCardsArray[5]; - - myHand->getBoard()->getMyCards(tempBoardCardsArray); - myHand->getGuiInterface()->logDealBoardCardsMsg(1, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2]); - logBoardCardsDone = 1; - - } - - bool allHighestSet = 1; - - // prfe, ob alle Sets gleich sind ( falls nicht, dann allHighestSet = 0 ) - for(i=0; igetPlayerArray()[i]->getMyActiveStatus() && myHand->getPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyAction() != 6) { - if(highestSet != myHand->getPlayerArray()[i]->getMySet()) { allHighestSet=0; } - } - } - - // prfen, ob Flop wirklich dran ist - if(!firstFlopRound && allHighestSet) { - - // Flop nicht dran, weil alle Sets gleich sind - //also gehe in Turn - myHand->setActualRound(2); - - //Action loeschen und ActionButtons refresh - for(i=0; igetPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyAction() != 6) myHand->getPlayerArray()[i]->setMyAction(0); - } - //Sets in den Pot verschieben und Sets = 0 und Pot-refresh - myHand->getBoard()->collectSets(); - myHand->getBoard()->collectPot(); - myHand->getGuiInterface()->refreshPot(); - - myHand->getGuiInterface()->refreshSet(); - myHand->getGuiInterface()->refreshCash(); - for(i=0; igetGuiInterface()->refreshAction(i,0); } - - myHand->switchRounds(); - } - else { - // Flop ist wirklich dran - - // Anzahl der effektiv gespielten Runden (des human player) erhöhen - if(myHand->getPlayerArray()[0]->getMyActiveStatus() && myHand->getPlayerArray()[0]->getMyAction() != 1) { - myHand->setBettingRoundsPlayed(1); - } - - if( !(myHand->getActualQuantityPlayers() < 3 && firstHeadsUpFlopRound == 1) ) { -// not first round in heads up (for headsup dealer is smallblind so it is dealers turn) - - // naechsten Spieler ermitteln - do { playersTurn = (playersTurn+1)%(MAX_NUMBER_OF_PLAYERS); - } while(!(myHand->getPlayerArray()[playersTurn]->getMyActiveStatus()) || (myHand->getPlayerArray()[playersTurn]->getMyAction())==1 || (myHand->getPlayerArray()[playersTurn]->getMyAction())==6); - } - else { firstHeadsUpFlopRound = 0; } - - //Spieler-Position vor SmallBlind-Position ermitteln - int activePlayerBeforeSmallBlind = smallBlindPosition; - do { activePlayerBeforeSmallBlind = (activePlayerBeforeSmallBlind + MAX_NUMBER_OF_PLAYERS - 1 ) % (MAX_NUMBER_OF_PLAYERS); - } while(!(myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyActiveStatus()) || (myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyAction())==1 || (myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyAction())==6); - - myHand->getPlayerArray()[playersTurn]->setMyTurn(1); - //highlight active players groupbox and clear action - myHand->getGuiInterface()->refreshGroupbox(playersTurn,2); - myHand->getGuiInterface()->refreshAction(playersTurn,0); - - // wenn wir letzter aktiver Spieler vor SmallBlind sind, dann flopFirstRound zuende - if(myHand->getPlayerArray()[playersTurn]->getMyID() == activePlayerBeforeSmallBlind) { firstFlopRound = 0; } - - if(playersTurn == 0) { - // Wir sind dran - myHand->getGuiInterface()->meInAction(); - } - else { - //Gegner sind dran - myHand->getGuiInterface()->flopAnimation2(); - } - } - } -} - -void LocalBeRoFlop::nextPlayer2() { - -// cout << "NextPlayerSpeed3 stop" << endl; - myHand->getPlayerArray()[playersTurn]->action(); - -} - diff --git a/src/engine/local_engine/localberoflop.h b/src/engine/local_engine/localberoflop.h index 4324b17d..0471ca1b 100644 --- a/src/engine/local_engine/localberoflop.h +++ b/src/engine/local_engine/localberoflop.h @@ -31,47 +31,6 @@ public: LocalBeRoFlop(HandInterface*, int, int, int, int); ~LocalBeRoFlop(); - - void setPlayersTurn(int theValue) { playersTurn = theValue; } - int getPlayersTurn() const { return playersTurn; } - - void setHighestSet(int theValue) { highestSet = theValue; } - int getHighestSet() const { return highestSet;} - - void setFirstFlopRound(bool theValue) { firstFlopRound = theValue;} - bool getFirstFlopRound() const { return firstFlopRound;} - - void setSmallBlindPosition(int theValue) { smallBlindPosition = theValue;} - int getSmallBlindPosition() const { return smallBlindPosition; } - - void setSmallBlind(int theValue) { smallBlind = theValue; } - int getSmallBlind() const { return smallBlind; } - - void resetFirstRun() { firstFlopRun = false; } - - void run(); - - void nextPlayer2(); - -private: - - HandInterface *myHand; - - int myID; - int actualQuantityPlayers; - int dealerPosition; - int smallBlindPosition; - - int smallBlind; - int highestSet; - - bool firstFlopRun; - bool firstFlopRound; - bool firstHeadsUpFlopRound; - int playersTurn; - - bool logBoardCardsDone; - }; #endif diff --git a/src/engine/local_engine/localberopostriver.cpp b/src/engine/local_engine/localberopostriver.cpp index ee0f9c6a..840f12a3 100644 --- a/src/engine/local_engine/localberopostriver.cpp +++ b/src/engine/local_engine/localberopostriver.cpp @@ -25,19 +25,8 @@ using namespace std; -LocalBeRoPostRiver::LocalBeRoPostRiver(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB), myHand(hi), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstRiverRun(1), firstRiverRound(1), firstHeadsUpRiverRound(1), playersTurn(dP), highestCardsValue(0), logBoardCardsDone(0) - +LocalBeRoPostRiver::LocalBeRoPostRiver(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB, GAME_STATE_POST_RIVER) { - - myBeRoID = GAME_STATE_POST_RIVER; - - int i; - - //SmallBlind-Position ermitteln - for(i=0; igetPlayerArray()[i]->getMyButton() == 2) smallBlindPosition = i; - } -cout << "LocalBeroPostRiver erstellt - " << myBeRoID << endl; } LocalBeRoPostRiver::~LocalBeRoPostRiver() @@ -45,109 +34,6 @@ LocalBeRoPostRiver::~LocalBeRoPostRiver() } -void LocalBeRoPostRiver::riverRun() { - - cout << "LocalBeroPostRiverRun!!!" << endl; - int i; - - if (firstRiverRun) { - myHand->getGuiInterface()->dealRiverCard(); - firstRiverRun = 0; - - } - - else { - //log the turned cards - if(!logBoardCardsDone) { - int tempBoardCardsArray[5]; - - myHand->getBoard()->getMyCards(tempBoardCardsArray); - myHand->getGuiInterface()->logDealBoardCardsMsg(3, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3], tempBoardCardsArray[4]); - logBoardCardsDone = 1; - } - - bool allHighestSet = 1; - - // prfe, ob alle Sets gleich sind ( falls nicht, dann allHighestSet = 0 ) - for(i=0; igetPlayerArray()[i]->getMyActiveStatus() && myHand->getPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyAction() != 6) { -// cout << "Spieler " << i << " Set " << myHand->getPlayerArray()[i]->getMySet() << endl; - if(highestSet != myHand->getPlayerArray()[i]->getMySet()) { allHighestSet=0; } - } - } -// cout << "allHighestSet " << allHighestSet << endl; - -// cout << "firstflopround " << firstRiverRound << endl; - - // prfen, ob River wirklich dran ist - if(!firstRiverRound && allHighestSet) { - - // River nicht dran, weil alle Sets gleich sind - //also gehe in Turn - myHand->setActualRound(4); - - //Action lï¿œchen und ActionButtons refresh - for(i=0; igetPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyAction() != 6) myHand->getPlayerArray()[i]->setMyAction(0); - } - //Sets in den Pot verschieben und Sets = 0 und Pot-refresh - myHand->getBoard()->collectSets(); - myHand->getBoard()->collectPot(); - myHand->getGuiInterface()->refreshPot(); - - myHand->getGuiInterface()->refreshSet(); - myHand->getGuiInterface()->refreshCash(); - for(i=0; igetGuiInterface()->refreshAction(i,0); } - - - myHand->switchRounds(); - } - else { - // River ist wirklich dran - - // Anzahl der effektiv gespielten Runden (des human player) erhöhen - if(myHand->getPlayerArray()[0]->getMyActiveStatus() && myHand->getPlayerArray()[0]->getMyAction() != 1) { - myHand->setBettingRoundsPlayed(3); - } - - if( !(myHand->getActualQuantityPlayers() < 3 && firstHeadsUpRiverRound == 1) ) { -// not first round in heads up (for headsup dealer is smallblind so it is dealers turn) - - // naechsten Spieler ermitteln - do { playersTurn = (playersTurn+1)%(MAX_NUMBER_OF_PLAYERS); - } while(!(myHand->getPlayerArray()[playersTurn]->getMyActiveStatus()) || (myHand->getPlayerArray()[playersTurn]->getMyAction())==1 || (myHand->getPlayerArray()[playersTurn]->getMyAction())==6); - } - else { firstHeadsUpRiverRound = 0; } - - //Spieler-Position vor SmallBlind-Position ermitteln - int activePlayerBeforeSmallBlind = smallBlindPosition; - do { activePlayerBeforeSmallBlind = (activePlayerBeforeSmallBlind + MAX_NUMBER_OF_PLAYERS - 1 ) % (MAX_NUMBER_OF_PLAYERS); - } while(!(myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyActiveStatus()) || (myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyAction())==1 || (myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyAction())==6); - - myHand->getPlayerArray()[playersTurn]->setMyTurn(1); - //highlight active players groupbox and clear action - myHand->getGuiInterface()->refreshGroupbox(playersTurn,2); - myHand->getGuiInterface()->refreshAction(playersTurn,0); - -// cout << "activePlayerBeforeSmallBlind " << activePlayerBeforeSmallBlind << endl; -// cout << "playersTurn " << playersTurn << endl; - // wenn wir letzter aktiver Spieler vor SmallBlind sind, dann flopFirstRound zuende - if(myHand->getPlayerArray()[playersTurn]->getMyID() == activePlayerBeforeSmallBlind) { firstRiverRound = 0; } - - if(playersTurn == 0) { - // Wir sind dran -// cout << "actualRound " << myHand->getActualRound() << endl; -// cout << "highestSet vor meInAction " << highestSet << endl; - myHand->getGuiInterface()->meInAction(); - } - else { - //Gegner sind dran - myHand->getGuiInterface()->riverAnimation2(); - } - } - } -} - void LocalBeRoPostRiver::postRiverRun() { int i; @@ -199,12 +85,6 @@ void LocalBeRoPostRiver::postRiverRun() { myHand->getGuiInterface()->postRiverRunAnimation1(); } -void LocalBeRoPostRiver::nextPlayer2() { - - myHand->getPlayerArray()[playersTurn]->action(); - -} - void LocalBeRoPostRiver::distributePot() { // int potCalcAllinArray[5][2]; // 0 -> ID , 1 -> AllInCash diff --git a/src/engine/local_engine/localberopostriver.h b/src/engine/local_engine/localberopostriver.h index 9be872bd..0e867124 100644 --- a/src/engine/local_engine/localberopostriver.h +++ b/src/engine/local_engine/localberopostriver.h @@ -31,57 +31,16 @@ public: LocalBeRoPostRiver(HandInterface*, int, int, int, int); ~LocalBeRoPostRiver(); - void setPlayersTurn(int theValue) { playersTurn = theValue; } - int getPlayersTurn() const { return playersTurn; } - - void setHighestSet(int theValue) { highestSet = theValue; } - int getHighestSet() const { return highestSet;} - - void setFirstRiverRound(bool theValue) { firstRiverRound = theValue;} - bool getFirstRiverRound() const { return firstRiverRound;} - - void setSmallBlindPosition(int theValue) { smallBlindPosition = theValue;} - int getSmallBlindPosition() const { return smallBlindPosition; } - - void setSmallBlind(int theValue) { smallBlind = theValue; } - int getSmallBlind() const { return smallBlind; } - void setHighestCardsValue(int theValue) { highestCardsValue = theValue;} int getHighestCardsValue() const { return highestCardsValue;} - void resetFirstRun() { firstRiverRun = false; } - - void riverRun(); void postRiverRun(); - void nextPlayer2(); void distributePot(); - - //only until bero refactory is over - void preflopRun() {} - void turnRun() {} - void flopRun() {} private: - HandInterface *myHand; - - int myID; - int actualQuantityPlayers; - int dealerPosition; - int smallBlindPosition; - - int smallBlind; - int highestSet; - - bool firstRiverRun; - bool firstRiverRound; - bool firstHeadsUpRiverRound; - int playersTurn; - int highestCardsValue; - bool logBoardCardsDone; - }; #endif diff --git a/src/engine/local_engine/localberopreflop.cpp b/src/engine/local_engine/localberopreflop.cpp index 87e25aa9..ef09de68 100644 --- a/src/engine/local_engine/localberopreflop.cpp +++ b/src/engine/local_engine/localberopreflop.cpp @@ -24,10 +24,10 @@ using namespace std; -LocalBeRoPreflop::LocalBeRoPreflop(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB), myHand(hi), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), bigBlindPosition(0), smallBlind(sB), highestSet(2*sB), preflopFirstRound(1), playersTurn(0) +LocalBeRoPreflop::LocalBeRoPreflop(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB, GAME_STATE_PREFLOP), bigBlindPosition(0) { - myBeRoID = GAME_STATE_PREFLOP; + highestSet = 2*smallBlind; // // BigBlind ermitteln bigBlindPosition = dealerPosition; @@ -72,11 +72,11 @@ void LocalBeRoPreflop::run() { } // prfen, ob Preflop wirklich dran ist - if(!preflopFirstRound && allHighestSet) { + if(!firstRound && allHighestSet) { // Preflop nicht dran, weil wir nicht mehr in erster PreflopRunde und alle Sets gleich sind //also gehe in Flop - myHand->setActualRound(1); + myHand->setActualRound(GAME_STATE_FLOP); //Action loeschen und ActionButtons refresh for(i=0; igetPlayerArray()[playersTurn]->getMyButton() == 3) preflopFirstRound = 0; + if(myHand->getPlayerArray()[playersTurn]->getMyButton() == 3) firstRound = 0; } while(!(myHand->getPlayerArray()[playersTurn]->getMyActiveStatus()) || myHand->getPlayerArray()[playersTurn]->getMyAction() == 1 || myHand->getPlayerArray()[playersTurn]->getMyAction() == 6); @@ -117,13 +117,7 @@ void LocalBeRoPreflop::run() { else { //Gegner sind dran // cout << "NextPlayerSpeed3 start" << endl; - myHand->getGuiInterface()->preflopAnimation2(); + myHand->getGuiInterface()->beRoAnimation2(myBeRoID); } } } - -void LocalBeRoPreflop::nextPlayer2() { -// cout << "NextPlayerSpeed3 stop" << endl; - myHand->getPlayerArray()[playersTurn]->action(); - -} diff --git a/src/engine/local_engine/localberopreflop.h b/src/engine/local_engine/localberopreflop.h index 44b865dd..6cf9fb82 100644 --- a/src/engine/local_engine/localberopreflop.h +++ b/src/engine/local_engine/localberopreflop.h @@ -31,32 +31,10 @@ public: LocalBeRoPreflop(HandInterface*, int, int, int, int); ~LocalBeRoPreflop(); - void setPlayersTurn(int theValue) { playersTurn = theValue; } - int getPlayersTurn() const { return playersTurn; } - - void setHighestSet(int theValue) { highestSet = theValue; } - int getHighestSet() const { return highestSet;} - void run(); - void nextPlayer2(); - private: - HandInterface *myHand; - - - int myID; - int actualQuantityPlayers; - int dealerPosition; int bigBlindPosition; - - int smallBlind; - int highestSet; - - bool preflopFirstRound; - int playersTurn; - - }; #endif diff --git a/src/engine/local_engine/localberoriver.cpp b/src/engine/local_engine/localberoriver.cpp index fd97acf4..593a409b 100644 --- a/src/engine/local_engine/localberoriver.cpp +++ b/src/engine/local_engine/localberoriver.cpp @@ -25,445 +25,10 @@ using namespace std; -LocalBeRoRiver::LocalBeRoRiver(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB), myHand(hi), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstRiverRun(1), firstRiverRound(1), firstHeadsUpRiverRound(1), playersTurn(dP), highestCardsValue(0), logBoardCardsDone(0) - +LocalBeRoRiver::LocalBeRoRiver(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB, GAME_STATE_RIVER) { - - myBeRoID = GAME_STATE_RIVER; - - int i; - - //SmallBlind-Position ermitteln - for(i=0; igetPlayerArray()[i]->getMyButton() == 2) smallBlindPosition = i; - } -cout << "LocalBeroRiver erstellt - " << myBeRoID << endl; } LocalBeRoRiver::~LocalBeRoRiver() { } - - -void LocalBeRoRiver::run() { - - cout << "LocalBeroRiverRun!!!" << endl; - int i; - - if (firstRiverRun) { - myHand->getGuiInterface()->dealRiverCard(); - firstRiverRun = 0; - - } - - else { - //log the turned cards - if(!logBoardCardsDone) { - int tempBoardCardsArray[5]; - - myHand->getBoard()->getMyCards(tempBoardCardsArray); - myHand->getGuiInterface()->logDealBoardCardsMsg(3, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3], tempBoardCardsArray[4]); - logBoardCardsDone = 1; - } - - bool allHighestSet = 1; - - // prfe, ob alle Sets gleich sind ( falls nicht, dann allHighestSet = 0 ) - for(i=0; igetPlayerArray()[i]->getMyActiveStatus() && myHand->getPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyAction() != 6) { - if(highestSet != myHand->getPlayerArray()[i]->getMySet()) { allHighestSet=0; } - } - } - - // prfen, ob River wirklich dran ist - if(!firstRiverRound && allHighestSet) { - - // River nicht dran, weil alle Sets gleich sind - //also gehe in Turn - myHand->setActualRound(4); - - //Action lï¿œchen und ActionButtons refresh - for(i=0; igetPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyAction() != 6) myHand->getPlayerArray()[i]->setMyAction(0); - } - //Sets in den Pot verschieben und Sets = 0 und Pot-refresh - myHand->getBoard()->collectSets(); - myHand->getBoard()->collectPot(); - myHand->getGuiInterface()->refreshPot(); - - myHand->getGuiInterface()->refreshSet(); - myHand->getGuiInterface()->refreshCash(); - for(i=0; igetGuiInterface()->refreshAction(i,0); } - - myHand->switchRounds(); - } - else { - // River ist wirklich dran - - // Anzahl der effektiv gespielten Runden (des human player) erhöhen - if(myHand->getPlayerArray()[0]->getMyActiveStatus() && myHand->getPlayerArray()[0]->getMyAction() != 1) { - myHand->setBettingRoundsPlayed(3); - } - - if( !(myHand->getActualQuantityPlayers() < 3 && firstHeadsUpRiverRound == 1) ) { -// not first round in heads up (for headsup dealer is smallblind so it is dealers turn) - - // naechsten Spieler ermitteln - do { playersTurn = (playersTurn+1)%(MAX_NUMBER_OF_PLAYERS); - } while(!(myHand->getPlayerArray()[playersTurn]->getMyActiveStatus()) || (myHand->getPlayerArray()[playersTurn]->getMyAction())==1 || (myHand->getPlayerArray()[playersTurn]->getMyAction())==6); - } - else { firstHeadsUpRiverRound = 0; } - - //Spieler-Position vor SmallBlind-Position ermitteln - int activePlayerBeforeSmallBlind = smallBlindPosition; - do { activePlayerBeforeSmallBlind = (activePlayerBeforeSmallBlind + MAX_NUMBER_OF_PLAYERS - 1 ) % (MAX_NUMBER_OF_PLAYERS); - } while(!(myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyActiveStatus()) || (myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyAction())==1 || (myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyAction())==6); - - myHand->getPlayerArray()[playersTurn]->setMyTurn(1); - //highlight active players groupbox and clear action - myHand->getGuiInterface()->refreshGroupbox(playersTurn,2); - myHand->getGuiInterface()->refreshAction(playersTurn,0); - - // wenn wir letzter aktiver Spieler vor SmallBlind sind, dann flopFirstRound zuende - if(myHand->getPlayerArray()[playersTurn]->getMyID() == activePlayerBeforeSmallBlind) { firstRiverRound = 0; } - - if(playersTurn == 0) { - // Wir sind dran - myHand->getGuiInterface()->meInAction(); - } - else { - //Gegner sind dran - myHand->getGuiInterface()->riverAnimation2(); - } - } - } -} - -void LocalBeRoRiver::postRiverRun() { - - int i; - - // für die Engine die durchschnittlichen Sets von Player 0 setzen --> UNUSED !!! -// if(myID < 5) { -// myHand->getPlayerArray()[0]->setMyAverageSets(((myHand->getPlayerArray()[0]->getMyAverageSets())*(myID-1))/myID + (myHand->getPlayerArray()[0]->getMyRoundStartCash()-myHand->getPlayerArray()[0]->getMyCash())/myID); -// } else { -// myHand->getPlayerArray()[0]->setMyAverageSets(((myHand->getPlayerArray()[0]->getMyAverageSets())*4)/5 + (myHand->getPlayerArray()[0]->getMyRoundStartCash()-myHand->getPlayerArray()[0]->getMyCash())/5); -// } - -// cout << myHand->getPlayerArray()[0]->getMyAverageSets() << endl; - - //berechnen welcher Spieler gewonnen hat - for(i=0; igetPlayerArray()[i]->getMyCardsValueInt() << endl; - - if(myHand->getPlayerArray()[i]->getMyActiveStatus() && myHand->getPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyCardsValueInt() > highestCardsValue ) { - highestCardsValue = myHand->getPlayerArray()[i]->getMyCardsValueInt(); - } - } - - // Durchschnittsets des human player ermitteln - myHand->getPlayerArray()[0]->setMyAverageSets(((myHand->getPlayerArray()[0]->getMyRoundStartCash())-(myHand->getPlayerArray()[0]->getMyCash()))/(myHand->getBettingRoundsPlayed()+1)); -// cout << myHand->getPlayerArray()[0]->getMyAverageSets() << endl; - - // Aggressivität des human player ermitteln - // anzahl der player die möglichkeit haben am pot teilzuhaben - int potPlayers = 0; - for(i=0; igetPlayerArray()[i]->getMyActiveStatus() && myHand->getPlayerArray()[i]->getMyAction() != 1) { - potPlayers++; - } - } - - // prüfen ob nur noch der human player an der verteilung teilnimmt und myAggressive für human player setzen - myHand->getPlayerArray()[0]->setMyAggressive(potPlayers == 1 && myHand->getPlayerArray()[0]->getMyActiveStatus() && myHand->getPlayerArray()[0]->getMyAction() != 1); - -// cout << "myAggressive: " << myHand->getPlayerArray()[0]->getMyAggressive() << endl; - - // Pot-Verteilung - distributePot(); - - //Pot auf 0 setzen - myHand->getBoard()->setPot(0); - - //starte die Animaionsreihe - myHand->getGuiInterface()->postRiverRunAnimation1(); -} - -void LocalBeRoRiver::nextPlayer2() { - - myHand->getPlayerArray()[playersTurn]->action(); - -} - -void LocalBeRoRiver::distributePot() { - -// int potCalcAllinArray[5][2]; // 0 -> ID , 1 -> AllInCash - - int i, j; - - //////////////////// - // (1) EINLEITUNG // - //////////////////// - - // die Potverteilung gliedert sich in mehrere Runden: - // in der ersten Runden sucht sich der Winner der BettingRound seinen zustehenden Anteil am Pot raus. das kann alles oder nur ein Teil sein (z.b. wenn er mit wenig allin gegangen ist und der Rest weitergespielt hat) - // in den darauffolgenden Verteilungsrunden suchen sich die jeweils nï¿œhsten Winner aus dem noch brig gebliebenen Pot ihren zustehenden Anteil raus - // die gesamte Potverteilung ist zuende, wenn der Pot leer ist und nichts mehr zu holen ist - - - ///////////////////// - // (2) HILFSMITTEL // - ///////////////////// - - // winnersArray erstellen -> hier werden die winner der jeweiligen Potverteilungsrunden eingetragen - int *winnersArray = new int[MAX_NUMBER_OF_PLAYERS]; - - // Anzahl der winner in einer Potverteilungsrunde - int winnersCounter = 0; - - // dieses Array ermittelt wieviel jeder Spieler wï¿œrend der gesamten BettingRound gesetzt hat - int *roundSetArray = new int[MAX_NUMBER_OF_PLAYERS]; - for(i=0; igetPlayerArray()[i]->getMyActiveStatus()) { - roundSetArray[i] = myHand->getPlayerArray()[i]->getMyRoundStartCash()-myHand->getPlayerArray()[i]->getMyCash(); - } - } - - // hier steht der CardsValue der Spieler drin die an der Potverteilung teilnehmen (d.h. aktiv und nicht gefoldet), bei allen anderen steht ne 0 - int *cardsValueArray = new int[MAX_NUMBER_OF_PLAYERS]; - int playerWantsPotCounter = 0; - - for(i=0; igetPlayerArray()[i]->getMyActiveStatus() && myHand->getPlayerArray()[i]->getMyAction() != 1) { - // nur bei den Spielen den Kartenwert eintragen, die an der Potverteilung teilnehmen - cardsValueArray[i] = myHand->getPlayerArray()[i]->getMyCardsValueInt(); - playerWantsPotCounter++; - } - } - - int winner; - int highestCardsValueTemp; - - // fr SplitPotBerechnung; - int winnersSets; - int winnersMaxSet; - int winnersPot; - bool playerIsWinner; - - - - ////////////////////// - // (3) DIE SCHLEIFE // - ////////////////////// - - - // Potverteilungsrunden -> solange noch was aus dem pot zu vergeben ist - while(playerWantsPotCounter != 0 ) { - - // highestCardsValueTemp zu Beginn der aktuellen Potverteilungsrunde auf Null setzen - highestCardsValueTemp = 0; - - // aktuellen highestCardsValueTemp berechnen, von denen die noch an der Potverteilung teilnehmen - for(i=0; i highestCardsValueTemp ) { - highestCardsValueTemp = myHand->getPlayerArray()[i]->getMyCardsValueInt(); - } - } - - // zu Beginn der Potverteilungsrunde die Anzahl der winner auf 0 setzen - winnersCounter = 0; - // Siegerposition und -anzahl von denen ermitteln, die noch an der Potverteilung teilnehmen - for(i=0; i bekommt den gesamten Pot -// if(myHand->getPlayerArray()[winner]->getMyAction() != 6) { -// -// myHand->getPlayerArray()[winner]->setMyCash(myHand->getPlayerArray()[winner]->getMyCash()+myHand->getBoard()->getPot()); -// myHand->getBoard()->setPot(0); -// playerWantsPotCounter = 1; -// -// } - // Winner ist All In gegangen -> von denen die weniger gesetzt oder gefoldet hatten alles nehmen und von denen die mehr gesetzt hatten nur die eigenen Sets nehmen -// else { - - // alle Spieler nacheinander durchgehen und prfen von wem man wieviel Geld aus dem Pot bekommt - for(i=0; igetPlayerArray()[i]->getMyAction() == 1) { - - // diesen Teil aus dem Pot holen - myHand->getPlayerArray()[winner]->setMyCash(myHand->getPlayerArray()[winner]->getMyCash()+roundSetArray[i]); - // Pot dementsprechend verkleinern - myHand->getBoard()->setPot(myHand->getBoard()->getPot() - roundSetArray[i]); - // deren Sets auf Null seztzen -> in den nï¿œhsten Potverteilungsrunden nimmt der Winner dann von diesen Spielern 0 Dollar aus dem Pot - roundSetArray[i] = 0; - - } - - // nun nur von den Spielern holen, die noch an der Potverteilung teilnehmen und natrlich nicht von einem selber - if(i != winner && cardsValueArray[i] != 0) { - - // zuerst alle rauspicken, die weniger oder das gleiche gesetzt hatten - if(roundSetArray[winner] >= roundSetArray[i]) { - - // von denen alles holen - myHand->getPlayerArray()[winner]->setMyCash(myHand->getPlayerArray()[winner]->getMyCash()+roundSetArray[i]); - // Pot dementsprechend verkleinern - myHand->getBoard()->setPot(myHand->getBoard()->getPot() - roundSetArray[i]); - // diese Spieler dann von der weiteren Potverteilung ausschlieï¿œn - cardsValueArray[i] = 0; - playerWantsPotCounter--; - // deren Sets auf Null seztzen, da sie schon alles abgegeben haben - roundSetArray[i] = 0; - - } - // nun alle Spieler die mehr gesetzt hatten - else { - - // den eigenen Setanteil aus dem Pot holen - myHand->getPlayerArray()[winner]->setMyCash(myHand->getPlayerArray()[winner]->getMyCash()+roundSetArray[winner]); - myHand->getBoard()->setPot(myHand->getBoard()->getPot() - roundSetArray[winner]); - // den Set des Gegners um den bereits abgenommenen Setanteil verkleinern - roundSetArray[i] = roundSetArray[i] - roundSetArray[winner]; - // diese Spieler nehmen an der weiteren Potverteilung teil - - } - } - } -// // } - - // zum Scluss noch eingenen Set wieder holen - myHand->getPlayerArray()[winner]->setMyCash(myHand->getPlayerArray()[winner]->getMyCash()+roundSetArray[winner]); - myHand->getBoard()->setPot(myHand->getBoard()->getPot() - roundSetArray[winner]); - // nicht mehr an der weiteren Potverteilung teilnehmen, da man sich alles geholt hat was einem zusteht - cardsValueArray[winner] = 0; - playerWantsPotCounter--; - // eigene Sets auf Null seztzen, da sie eben eingesammelt wurden - roundSetArray[winner] = 0; - - } - - - // ---------------------------------------------------------------------- - // B) mehrere haben die aktuelle Potverteilungsrunde gewonnen -> SplitPot - // ---------------------------------------------------------------------- - else { - - // hierfr wird ein temporï¿œer WinnersPot erstellt; dort flieï¿œn erstmal alle zustehenden Anteile aus dem Pot rauf; am Ende wird dies auf die Winners verteilt - winnersPot = 0; - // hï¿œhster Set aller Winner - winnersMaxSet = 0; - - // den hï¿œhsten Set aller Winner ermitteln - for(i=0; i winnersMaxSet) winnersMaxSet = roundSetArray[i]; - } - - // gesamtSet aller Winner - winnersSets = 0; - for(i=0; i Spieler i gehï¿œt zu den Winnern - } - - // zuerst prfen ob ein gefoldeter Spieler was gesetzt hatte - if(!playerIsWinner && myHand->getPlayerArray()[i]->getMyAction() == 1) { - - // diesen Teil aus dem Pot holen und dem winnersPot geben - winnersPot += roundSetArray[i]; - // Pot dementsprechend verkleinern - myHand->getBoard()->setPot(myHand->getBoard()->getPot() - roundSetArray[i]); - // deren Sets auf Null seztzen -> in den nï¿œhsten Potverteilungsrunden nehmen die Winner dann von diesen Spielern 0 Dollar aus dem Pot - roundSetArray[i] = 0; - - } - - // nun nur von den Spielern holen, die noch an der Potverteilung teilnehmen und natrlich nicht zu den Winnern gehï¿œen - if(!playerIsWinner && cardsValueArray[i] != 0) { - - // zuerst alle rauspicken, die weniger oder das gleiche gesetzt hatten - if(winnersMaxSet >= roundSetArray[i]) { - - // von denen alles holen - winnersPot += roundSetArray[i]; - // Pot dementsprechend verkleinern - myHand->getBoard()->setPot(myHand->getBoard()->getPot() - roundSetArray[i]); - // diese Spieler dann von der weiteren Potverteilung ausschlieï¿œn - cardsValueArray[i] = 0; - playerWantsPotCounter--; - // deren Sets auf Null seztzen, da sie schon alles abgegeben haben - roundSetArray[i] = 0; - - } - // nun alle Spieler die mehr gesetzt hatten - else { - - // den eigenen Setanteil aus dem Pot holen - winnersPot += winnersMaxSet; - myHand->getBoard()->setPot(myHand->getBoard()->getPot() - winnersMaxSet); - // den Set des Gegners um den bereits abgenommenen Setanteil verkleinern - roundSetArray[i] = roundSetArray[i] - winnersMaxSet; - // diese Spieler nehmen an der weiteren Potverteilung teil - - } - } - } - - // zum Schluss noch die eingenen Set aus dem Pot holen - winnersPot += winnersSets; - myHand->getBoard()->setPot(myHand->getBoard()->getPot() - winnersSets); - - // winnersPot verteilen (anteilmï¿œig) - for(i=0; igetPlayerArray()[winnersArray[i]]->setMyCash(myHand->getPlayerArray()[winnersArray[i]]->getMyCash()+((roundSetArray[winnersArray[i]]*winnersPot)/winnersSets)); - } - - - for(i=0; igetBoard()->getPot() != 0) cout << "!!! Pot: " << myHand->getBoard()->getPot() << endl; - - delete[] winnersArray; - delete[] roundSetArray; - delete[] cardsValueArray; - - -} diff --git a/src/engine/local_engine/localberoriver.h b/src/engine/local_engine/localberoriver.h index 76fb26f5..cadd935e 100644 --- a/src/engine/local_engine/localberoriver.h +++ b/src/engine/local_engine/localberoriver.h @@ -30,53 +30,6 @@ class LocalBeRoRiver : public LocalBeRo{ public: LocalBeRoRiver(HandInterface*, int, int, int, int); ~LocalBeRoRiver(); - - void setPlayersTurn(int theValue) { playersTurn = theValue; } - int getPlayersTurn() const { return playersTurn; } - - void setHighestSet(int theValue) { highestSet = theValue; } - int getHighestSet() const { return highestSet;} - - void setFirstRiverRound(bool theValue) { firstRiverRound = theValue;} - bool getFirstRiverRound() const { return firstRiverRound;} - - void setSmallBlindPosition(int theValue) { smallBlindPosition = theValue;} - int getSmallBlindPosition() const { return smallBlindPosition; } - - void setSmallBlind(int theValue) { smallBlind = theValue; } - int getSmallBlind() const { return smallBlind; } - - void setHighestCardsValue(int theValue) { highestCardsValue = theValue;} - int getHighestCardsValue() const { return highestCardsValue;} - - void resetFirstRun() { firstRiverRun = false; } - - void run(); - void postRiverRun(); - void nextPlayer2(); - void distributePot(); - -private: - - HandInterface *myHand; - - int myID; - int actualQuantityPlayers; - int dealerPosition; - int smallBlindPosition; - - int smallBlind; - int highestSet; - - bool firstRiverRun; - bool firstRiverRound; - bool firstHeadsUpRiverRound; - int playersTurn; - - int highestCardsValue; - - bool logBoardCardsDone; - }; #endif diff --git a/src/engine/local_engine/localberoturn.cpp b/src/engine/local_engine/localberoturn.cpp index 4d0b3e5d..4e5ddf54 100644 --- a/src/engine/local_engine/localberoturn.cpp +++ b/src/engine/local_engine/localberoturn.cpp @@ -24,126 +24,10 @@ using namespace std; -LocalBeRoTurn::LocalBeRoTurn(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB), myHand(hi), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstTurnRun(1), firstTurnRound(1), firstHeadsUpTurnRound(1), playersTurn(dP), logBoardCardsDone(0) - +LocalBeRoTurn::LocalBeRoTurn(HandInterface* hi, int id, int qP, int dP, int sB) : LocalBeRo(hi, id, qP, dP, sB, GAME_STATE_TURN) { - - myBeRoID = GAME_STATE_TURN; - - int i; - - //SmallBlind-Position ermitteln - for(i=0; igetPlayerArray()[i]->getMyButton() == 2) smallBlindPosition = i; - } - -cout << "LocalBeroTurn erstellt - " << myBeRoID << endl; - } LocalBeRoTurn::~LocalBeRoTurn() { } - - -void LocalBeRoTurn::run() { - - cout << "LocalBeroTurnRun!!!" << endl; - int i; - - if (firstTurnRun) { - myHand->getGuiInterface()->dealTurnCard(); - firstTurnRun = 0; - - } - - else { - //log the turned cards - if(!logBoardCardsDone) { - int tempBoardCardsArray[5]; - - myHand->getBoard()->getMyCards(tempBoardCardsArray); - myHand->getGuiInterface()->logDealBoardCardsMsg(2, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3]); - logBoardCardsDone = 1; - } - - bool allHighestSet = 1; - - // prfe, ob alle Sets gleich sind ( falls nicht, dann allHighestSet = 0 ) - for(i=0; igetPlayerArray()[i]->getMyActiveStatus() && myHand->getPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyAction() != 6) { - if(highestSet != myHand->getPlayerArray()[i]->getMySet()) { allHighestSet=0; } - } - } - - // prfen, ob Turn wirklich dran ist - if(!firstTurnRound && allHighestSet) { - - // Turn nicht dran, weil alle Sets gleich sind - //also gehe in Turn - myHand->setActualRound(3); - - //Action l�chen und ActionButtons refresh - for(i=0; igetPlayerArray()[i]->getMyAction() != 1 && myHand->getPlayerArray()[i]->getMyAction() != 6) myHand->getPlayerArray()[i]->setMyAction(0); - } - //Sets in den Pot verschieben und Sets = 0 und Pot-refresh - myHand->getBoard()->collectSets(); - myHand->getBoard()->collectPot(); - myHand->getGuiInterface()->refreshPot(); - - myHand->getGuiInterface()->refreshSet(); - myHand->getGuiInterface()->refreshCash(); - for(i=0; igetGuiInterface()->refreshAction(i,0); } - - myHand->switchRounds(); - } - else { - // Turn ist wirklich dran - - // Anzahl der effektiv gespielten Runden (des human player) erhöhen - if(myHand->getPlayerArray()[0]->getMyActiveStatus() && myHand->getPlayerArray()[0]->getMyAction() != 1) { - myHand->setBettingRoundsPlayed(2); - } - - if( !(myHand->getActualQuantityPlayers() < 3 && firstHeadsUpTurnRound == 1) ) { -// not first round in heads up (for headsup dealer is smallblind so it is dealers turn) - - // naechsten Spieler ermitteln - do { playersTurn = (playersTurn+1)%(MAX_NUMBER_OF_PLAYERS); - } while(!(myHand->getPlayerArray()[playersTurn]->getMyActiveStatus()) || (myHand->getPlayerArray()[playersTurn]->getMyAction())==1 || (myHand->getPlayerArray()[playersTurn]->getMyAction())==6); - } - else { firstHeadsUpTurnRound = 0; } - - //Spieler-Position vor SmallBlind-Position ermitteln - int activePlayerBeforeSmallBlind = smallBlindPosition; - do { activePlayerBeforeSmallBlind = (activePlayerBeforeSmallBlind + MAX_NUMBER_OF_PLAYERS - 1 ) % (MAX_NUMBER_OF_PLAYERS); - } while(!(myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyActiveStatus()) || (myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyAction())==1 || (myHand->getPlayerArray()[activePlayerBeforeSmallBlind]->getMyAction())==6); - - myHand->getPlayerArray()[playersTurn]->setMyTurn(1); - //highlight active players groupbox and clear action - myHand->getGuiInterface()->refreshGroupbox(playersTurn,2); - myHand->getGuiInterface()->refreshAction(playersTurn,0); - - // wenn wir letzter aktiver Spieler vor SmallBlind sind, dann flopFirstRound zuende - if(myHand->getPlayerArray()[playersTurn]->getMyID() == activePlayerBeforeSmallBlind) { firstTurnRound = 0; } - - if(playersTurn == 0) { - // Wir sind dran - myHand->getGuiInterface()->meInAction(); - } - else { - //Gegner sind dran - myHand->getGuiInterface()->turnAnimation2(); - } - } - } -} - -void LocalBeRoTurn::nextPlayer2() { -// cout << "NextPlayerSpeed3 stop" << endl; - myHand->getPlayerArray()[playersTurn]->action(); - -} - - diff --git a/src/engine/local_engine/localberoturn.h b/src/engine/local_engine/localberoturn.h index 627a18ce..c40c6905 100644 --- a/src/engine/local_engine/localberoturn.h +++ b/src/engine/local_engine/localberoturn.h @@ -30,45 +30,6 @@ public: LocalBeRoTurn(HandInterface*, int, int, int, int); ~LocalBeRoTurn(); - void setPlayersTurn(int theValue) { playersTurn = theValue; } - int getPlayersTurn() const { return playersTurn; } - - void setHighestSet(int theValue) { highestSet = theValue; } - int getHighestSet() const { return highestSet;} - - void setFirstTurnRound(bool theValue) { firstTurnRound = theValue;} - bool getFirstTurnRound() const { return firstTurnRound;} - - void setSmallBlindPosition(int theValue) { smallBlindPosition = theValue;} - int getSmallBlindPosition() const { return smallBlindPosition; } - - void setSmallBlind(int theValue) { smallBlind = theValue; } - int getSmallBlind() const { return smallBlind; } - - void resetFirstRun() { firstTurnRun = false; } - - void nextPlayer2(); - void run(); - -private: - - HandInterface *myHand; - - int myID; - int actualQuantityPlayers; - int dealerPosition; - int smallBlindPosition; - - int smallBlind; - int highestSet; - - bool firstTurnRun; - bool firstTurnRound; - bool firstHeadsUpTurnRound; - int playersTurn; - - bool logBoardCardsDone; - }; #endif diff --git a/src/engine/network_engine/clientflop.h b/src/engine/network_engine/clientflop.h index ccf1c1b8..e7786cd0 100644 --- a/src/engine/network_engine/clientflop.h +++ b/src/engine/network_engine/clientflop.h @@ -1,84 +1,84 @@ -/*************************************************************************** - * Copyright (C) 2007 by Lothar May * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef CLIENTFLOP_H -#define CLIENTFLOP_H - -#include "berointerface.h" -#include - -class HandInterface; - -class ClientBeRoFlop : public BeRoInterface -{ -public: - ClientBeRoFlop(HandInterface*, int, int, int, int); - ~ClientBeRoFlop(); - - int getMyBeRoID() const; - - void setPlayersTurn(int theValue); - int getPlayersTurn() const; - - void setHighestSet(int theValue); - int getHighestSet() const; - - void setFirstFlopRound(bool theValue); - bool getFirstFlopRound() const; - - void setSmallBlindPosition(int theValue); - int getSmallBlindPosition() const; - - void setSmallBlind(int theValue); - int getSmallBlind() const; - - void setHighestCardsValue(int theValue) {} - int getHighestCardsValue() const {return 0;} - - void resetFirstRun(); - - void run(); - - void preflopRun() {} - void flopRun() {} - void turnRun() {} - void riverRun() {} - void postRiverRun() {} - - void nextPlayer2() {} - -private: - mutable boost::recursive_mutex m_syncMutex; - - HandInterface *myHand; - - int myID; - int actualQuantityPlayers; - int dealerPosition; - int smallBlindPosition; - - int smallBlind; - int highestSet; - - bool firstFlopRun; - bool firstFlopRound; - int playersTurn; - -}; - -#endif +/*************************************************************************** + * Copyright (C) 2007 by Lothar May * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#ifndef CLIENTFLOP_H +#define CLIENTFLOP_H + +#include "berointerface.h" +#include + +class HandInterface; + +class ClientBeRoFlop : public BeRoInterface +{ +public: + ClientBeRoFlop(HandInterface*, int, int, int, int); + ~ClientBeRoFlop(); + + int getMyBeRoID() const; + + void setPlayersTurn(int theValue); + int getPlayersTurn() const; + + void setHighestSet(int theValue); + int getHighestSet() const; + + void setFirstFlopRound(bool theValue); + bool getFirstFlopRound() const; + + void setSmallBlindPosition(int theValue); + int getSmallBlindPosition() const; + + void setSmallBlind(int theValue); + int getSmallBlind() const; + + void setHighestCardsValue(int theValue) {} + int getHighestCardsValue() const {return 0;} + + void resetFirstRun(); + + void run(); + + void preflopRun() {} + void flopRun() {} + void turnRun() {} + void riverRun() {} + void postRiverRun() {} + + void nextPlayer() {} + +private: + mutable boost::recursive_mutex m_syncMutex; + + HandInterface *myHand; + + int myID; + int actualQuantityPlayers; + int dealerPosition; + int smallBlindPosition; + + int smallBlind; + int highestSet; + + bool firstFlopRun; + bool firstFlopRound; + int playersTurn; + +}; + +#endif diff --git a/src/engine/network_engine/clientpreflop.h b/src/engine/network_engine/clientpreflop.h index 2d55c897..affbce13 100644 --- a/src/engine/network_engine/clientpreflop.h +++ b/src/engine/network_engine/clientpreflop.h @@ -1,75 +1,75 @@ -/*************************************************************************** - * Copyright (C) 2007 by Lothar May * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef CLIENTPREFLOP_H -#define CLIENTPREFLOP_H - -#include -#include - -class HandInterface; - -class ClientBeRoPreflop : public BeRoInterface{ - -public: - ClientBeRoPreflop(HandInterface*, int, int, int, int); - ~ClientBeRoPreflop(); - - int getMyBeRoID() const; - - void setPlayersTurn(int theValue); - int getPlayersTurn() const; - - void setHighestSet(int theValue); - int getHighestSet() const; - - void setHighestCardsValue(int theValue) {} - int getHighestCardsValue() const {return 0;} - - void resetFirstRun(); - - void run(); - - void preflopRun() {} - void flopRun() {} - void turnRun() {} - void riverRun() {} - void postRiverRun() {} - - void nextPlayer2() {} - -private: - mutable boost::recursive_mutex m_syncMutex; - - HandInterface *myHand; - - int myID; - int actualQuantityPlayers; - int dealerPosition; - int bigBlindPosition; - - int smallBlind; - int highestSet; - - bool preflopFirstRound; - int playersTurn; - - -}; - -#endif +/*************************************************************************** + * Copyright (C) 2007 by Lothar May * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#ifndef CLIENTPREFLOP_H +#define CLIENTPREFLOP_H + +#include +#include + +class HandInterface; + +class ClientBeRoPreflop : public BeRoInterface{ + +public: + ClientBeRoPreflop(HandInterface*, int, int, int, int); + ~ClientBeRoPreflop(); + + int getMyBeRoID() const; + + void setPlayersTurn(int theValue); + int getPlayersTurn() const; + + void setHighestSet(int theValue); + int getHighestSet() const; + + void setHighestCardsValue(int theValue) {} + int getHighestCardsValue() const {return 0;} + + void resetFirstRun(); + + void run(); + + void preflopRun() {} + void flopRun() {} + void turnRun() {} + void riverRun() {} + void postRiverRun() {} + + void nextPlayer() {} + +private: + mutable boost::recursive_mutex m_syncMutex; + + HandInterface *myHand; + + int myID; + int actualQuantityPlayers; + int dealerPosition; + int bigBlindPosition; + + int smallBlind; + int highestSet; + + bool preflopFirstRound; + int playersTurn; + + +}; + +#endif diff --git a/src/engine/network_engine/clientriver.h b/src/engine/network_engine/clientriver.h index 85658da7..227f12f4 100644 --- a/src/engine/network_engine/clientriver.h +++ b/src/engine/network_engine/clientriver.h @@ -1,89 +1,89 @@ -/*************************************************************************** - * Copyright (C) 2007 by Lothar May * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef CLIENTRIVER_H -#define CLIENTRIVER_H - -#include -#include - -class HandInterface; - - -class ClientBeRoRiver : public BeRoInterface{ -public: - ClientBeRoRiver(HandInterface*, int, int, int, int); - ~ClientBeRoRiver(); - - int getMyBeRoID() const; - - void setPlayersTurn(int theValue); - int getPlayersTurn() const; - - void setHighestSet(int theValue); - int getHighestSet() const; - - void setFirstRiverRound(bool theValue); - bool getFirstRiverRound() const; - - void setSmallBlindPosition(int theValue); - int getSmallBlindPosition() const; - - void setSmallBlind(int theValue); - int getSmallBlind() const; - - void setHighestCardsValue(int theValue); - int getHighestCardsValue() const; - - void resetFirstRun(); - - void distributePot(); - - void run(); - - void preflopRun() {} - void flopRun() {} - void turnRun() {} - void riverRun() {} - void postRiverRun() {} - - void nextPlayer2() {} - -private: - mutable boost::recursive_mutex m_syncMutex; - - HandInterface *myHand; - - int myID; - int actualQuantityPlayers; - int dealerPosition; - int smallBlindPosition; - - int smallBlind; - int highestSet; - - bool firstRiverRun; - bool firstRiverRound; - int playersTurn; - - int highestCardsValue; - -}; - -#endif - +/*************************************************************************** + * Copyright (C) 2007 by Lothar May * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#ifndef CLIENTRIVER_H +#define CLIENTRIVER_H + +#include +#include + +class HandInterface; + + +class ClientBeRoRiver : public BeRoInterface{ +public: + ClientBeRoRiver(HandInterface*, int, int, int, int); + ~ClientBeRoRiver(); + + int getMyBeRoID() const; + + void setPlayersTurn(int theValue); + int getPlayersTurn() const; + + void setHighestSet(int theValue); + int getHighestSet() const; + + void setFirstRiverRound(bool theValue); + bool getFirstRiverRound() const; + + void setSmallBlindPosition(int theValue); + int getSmallBlindPosition() const; + + void setSmallBlind(int theValue); + int getSmallBlind() const; + + void setHighestCardsValue(int theValue); + int getHighestCardsValue() const; + + void resetFirstRun(); + + void distributePot(); + + void run(); + + void preflopRun() {} + void flopRun() {} + void turnRun() {} + void riverRun() {} + void postRiverRun() {} + + void nextPlayer() {} + +private: + mutable boost::recursive_mutex m_syncMutex; + + HandInterface *myHand; + + int myID; + int actualQuantityPlayers; + int dealerPosition; + int smallBlindPosition; + + int smallBlind; + int highestSet; + + bool firstRiverRun; + bool firstRiverRound; + int playersTurn; + + int highestCardsValue; + +}; + +#endif + diff --git a/src/engine/network_engine/clientturn.h b/src/engine/network_engine/clientturn.h index e048e57e..f34c315c 100644 --- a/src/engine/network_engine/clientturn.h +++ b/src/engine/network_engine/clientturn.h @@ -1,83 +1,83 @@ -/*************************************************************************** - * Copyright (C) 2007 by Lothar May * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifndef CLIENTTURN_H -#define CLIENTTURN_H - -#include -#include - -class HandInterface; - -class ClientBeRoTurn : public BeRoInterface{ -public: - ClientBeRoTurn(HandInterface*, int, int, int, int); - ~ClientBeRoTurn(); - - int getMyBeRoID() const; - - void setPlayersTurn(int theValue); - int getPlayersTurn() const; - - void setHighestSet(int theValue); - int getHighestSet() const; - - void setFirstTurnRound(bool theValue); - bool getFirstTurnRound() const; - - void setSmallBlindPosition(int theValue); - int getSmallBlindPosition() const; - - void setSmallBlind(int theValue); - int getSmallBlind() const; - - void setHighestCardsValue(int theValue) {} - int getHighestCardsValue() const {return 0;} - - void resetFirstRun(); - - void run(); - - void preflopRun() {} - void flopRun() {} - void turnRun() {} - void riverRun() {} - void postRiverRun() {} - - void nextPlayer2() {} - -private: - mutable boost::recursive_mutex m_syncMutex; - - HandInterface *myHand; - - int myID; - int actualQuantityPlayers; - int dealerPosition; - int smallBlindPosition; - - int smallBlind; - int highestSet; - - bool firstTurnRun; - bool firstTurnRound; - int playersTurn; - -}; - -#endif +/*************************************************************************** + * Copyright (C) 2007 by Lothar May * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#ifndef CLIENTTURN_H +#define CLIENTTURN_H + +#include +#include + +class HandInterface; + +class ClientBeRoTurn : public BeRoInterface{ +public: + ClientBeRoTurn(HandInterface*, int, int, int, int); + ~ClientBeRoTurn(); + + int getMyBeRoID() const; + + void setPlayersTurn(int theValue); + int getPlayersTurn() const; + + void setHighestSet(int theValue); + int getHighestSet() const; + + void setFirstTurnRound(bool theValue); + bool getFirstTurnRound() const; + + void setSmallBlindPosition(int theValue); + int getSmallBlindPosition() const; + + void setSmallBlind(int theValue); + int getSmallBlind() const; + + void setHighestCardsValue(int theValue) {} + int getHighestCardsValue() const {return 0;} + + void resetFirstRun(); + + void run(); + + void preflopRun() {} + void flopRun() {} + void turnRun() {} + void riverRun() {} + void postRiverRun() {} + + void nextPlayer() {} + +private: + mutable boost::recursive_mutex m_syncMutex; + + HandInterface *myHand; + + int myID; + int actualQuantityPlayers; + int dealerPosition; + int smallBlindPosition; + + int smallBlind; + int highestSet; + + bool firstTurnRun; + bool firstTurnRound; + int playersTurn; + +}; + +#endif diff --git a/src/gui/generic/serverguiwrapper.cpp b/src/gui/generic/serverguiwrapper.cpp index 59414b82..0eaa171c 100644 --- a/src/gui/generic/serverguiwrapper.cpp +++ b/src/gui/generic/serverguiwrapper.cpp @@ -72,6 +72,8 @@ void ServerGuiWrapper::dealRiverCard() {} void ServerGuiWrapper::nextPlayerAnimation() {} +void ServerGuiWrapper::beRoAnimation2(int myBeRoID) {} + void ServerGuiWrapper::preflopAnimation1() {} void ServerGuiWrapper::preflopAnimation2() {} diff --git a/src/gui/generic/serverguiwrapper.h b/src/gui/generic/serverguiwrapper.h index 7f4b4fa4..8f589c57 100644 --- a/src/gui/generic/serverguiwrapper.h +++ b/src/gui/generic/serverguiwrapper.h @@ -56,6 +56,8 @@ public: void nextPlayerAnimation(); + void beRoAnimation2(int); + void preflopAnimation1(); void preflopAnimation2(); diff --git a/src/gui/guiinterface.h b/src/gui/guiinterface.h index 8eea1964..780f1327 100644 --- a/src/gui/guiinterface.h +++ b/src/gui/guiinterface.h @@ -62,6 +62,8 @@ public: virtual void nextPlayerAnimation()=0; + virtual void beRoAnimation2(int)=0; + virtual void preflopAnimation1()=0; virtual void preflopAnimation2()=0; diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp index e726365c..ca0ac340 100644 --- a/src/gui/qt/guiwrapper.cpp +++ b/src/gui/qt/guiwrapper.cpp @@ -75,6 +75,8 @@ void GuiWrapper::dealRiverCard() { myW->signalDealRiverCards0(); } void GuiWrapper::nextPlayerAnimation() { myW->signalNextPlayerAnimation(); } +void GuiWrapper::beRoAnimation2(int myBeRoID) { myW->signalBeRoAnimation2(myBeRoID); } + void GuiWrapper::preflopAnimation1() { myW->signalPreflopAnimation1(); } void GuiWrapper::preflopAnimation2() { myW->signalPreflopAnimation2(); } diff --git a/src/gui/qt/guiwrapper.h b/src/gui/qt/guiwrapper.h index 87e10ef2..a4478f49 100644 --- a/src/gui/qt/guiwrapper.h +++ b/src/gui/qt/guiwrapper.h @@ -63,6 +63,8 @@ public: void nextPlayerAnimation(); + void beRoAnimation2(int); + void preflopAnimation1(); void preflopAnimation2(); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 9bbb50fc..3fec91b4 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -613,6 +613,9 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) connect(this, SIGNAL(signalNextPlayerAnimation()), this, SLOT(nextPlayerAnimation())); + ; + connect(this, SIGNAL(signalBeRoAnimation2(int)), this, SLOT(beRoAnimation2(int))); + connect(this, SIGNAL(signalPreflopAnimation1()), this, SLOT(preflopAnimation1())); connect(this, SIGNAL(signalPreflopAnimation2()), this, SLOT(preflopAnimation2())); connect(this, SIGNAL(signalFlopAnimation1()), this, SLOT(flopAnimation1())); @@ -1829,30 +1832,47 @@ void mainWindowImpl::nextPlayerAnimation() { nextPlayerAnimationTimer->start(nextPlayerSpeed1); } +void mainWindowImpl::beRoAnimation2(int myBeRoID) { + + switch(myBeRoID) { + + case 0: { preflopAnimation2(); } + break; + case 1: { flopAnimation2(); } + break; + case 2: { turnAnimation2(); } + break; + case 3: { riverAnimation2(); } + break; + default: { cout << "beRoAnimation2 Error" << endl; } + } +} + + void mainWindowImpl::preflopAnimation1() { preflopAnimation1Timer->start(nextPlayerSpeed2); } void mainWindowImpl::preflopAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getPreflop()->run(); } void mainWindowImpl::preflopAnimation2() { preflopAnimation2Timer->start(preflopNextPlayerSpeed); } -void mainWindowImpl::preflopAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getPreflop()->nextPlayer2(); } +void mainWindowImpl::preflopAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getPreflop()->nextPlayer(); } void mainWindowImpl::flopAnimation1() { flopAnimation1Timer->start(nextPlayerSpeed2); } void mainWindowImpl::flopAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getFlop()->run(); } void mainWindowImpl::flopAnimation2() { flopAnimation2Timer->start(nextPlayerSpeed3); } -void mainWindowImpl::flopAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getFlop()->nextPlayer2(); } +void mainWindowImpl::flopAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getFlop()->nextPlayer(); } void mainWindowImpl::turnAnimation1() { turnAnimation1Timer->start(nextPlayerSpeed2); } void mainWindowImpl::turnAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getTurn()->run(); } void mainWindowImpl::turnAnimation2() { turnAnimation2Timer->start(nextPlayerSpeed3); } -void mainWindowImpl::turnAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getTurn()->nextPlayer2(); } +void mainWindowImpl::turnAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getTurn()->nextPlayer(); } void mainWindowImpl::riverAnimation1() { riverAnimation1Timer->start(nextPlayerSpeed2); } void mainWindowImpl::riverAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getRiver()->run(); } void mainWindowImpl::riverAnimation2() { riverAnimation2Timer->start(nextPlayerSpeed3); } -void mainWindowImpl::riverAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getRiver()->nextPlayer2(); } +void mainWindowImpl::riverAnimation2Action() { mySession->getCurrentGame()->getCurrentHand()->getRiver()->nextPlayer(); } void mainWindowImpl::postRiverAnimation1() { postRiverAnimation1Timer->start(nextPlayerSpeed2); } void mainWindowImpl::postRiverAnimation1Action() { mySession->getCurrentGame()->getCurrentHand()->getRiver()->postRiverRun(); } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 06515af7..0ef7ca00 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -104,6 +104,8 @@ signals: void signalNextPlayerAnimation(); + void signalBeRoAnimation2(int); + void signalPreflopAnimation1(); void signalPreflopAnimation2(); void signalFlopAnimation1(); @@ -201,6 +203,8 @@ public slots: void nextPlayerAnimation(); + void beRoAnimation2(int); + void preflopAnimation1(); void preflopAnimation1Action(); void preflopAnimation2();