From 7319dd4ed04c9608c3008e5d7fb4c2d51be9a95a Mon Sep 17 00:00:00 2001 From: floty Date: Mon, 5 Mar 2007 19:21:41 +0000 Subject: [PATCH] actualQuantityPlayers -><- startQuantityPlayers --- src/engine/handinterface.h | 3 +++ src/engine/local_engine/localhand.cpp | 20 ++++++++++---------- src/engine/local_engine/localhand.h | 4 ++++ src/gui/qt/log/log.cpp | 12 ++++++------ src/gui/qt/mainwindow/mainwindowimpl.cpp | 2 +- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/engine/handinterface.h b/src/engine/handinterface.h index cca1bcd7..143218e7 100644 --- a/src/engine/handinterface.h +++ b/src/engine/handinterface.h @@ -47,6 +47,9 @@ public: virtual void setActualQuantityPlayers(const int& theValue) =0; virtual int getActualQuantityPlayers() const =0; + virtual void setStartQuantityPlayers(const int& theValue) =0; + virtual int getStartQuantityPlayers() const =0; + virtual void setActualRound(const int& theValue) =0; virtual int getActualRound() const =0; diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp index 25e28765..abdbf6fb 100755 --- a/src/engine/local_engine/localhand.cpp +++ b/src/engine/local_engine/localhand.cpp @@ -21,7 +21,7 @@ using namespace std; -LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int qP, int dP, int sB,int sC) : HandInterface(), myFactory(f), myGui(g), myBoard(b), playerArray(p), myPreflop(0), myFlop(0), myTurn(0), myRiver(0), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), actualRound(0), smallBlind(sB), startCash(sC), allInCondition(0) +LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int qP, int dP, int sB,int sC) : HandInterface(), myFactory(f), myGui(g), myBoard(b), playerArray(p), myPreflop(0), myFlop(0), myTurn(0), myRiver(0), myID(id), actualQuantityPlayers(qP), startQuantityPlayers(qP), dealerPosition(dP), actualRound(0), smallBlind(sB), startCash(sC), allInCondition(0) { int i, j; @@ -31,7 +31,7 @@ LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, Playe myBoard->setHand(this); - for(i=0; isetHand(this); + for(i=0; isetHand(this); // roundStartCashArray fllen @@ -47,8 +47,8 @@ LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, Playe // Karten generieren und Board sowie Player zuweisen Tools myTool; - int *cardsArray = new int[2*actualQuantityPlayers+5]; - myTool.getRandNumber(0, 51, 2*actualQuantityPlayers+5, cardsArray, 1); + int *cardsArray = new int[2*startQuantityPlayers+5]; + myTool.getRandNumber(0, 51, 2*startQuantityPlayers+5, cardsArray, 1); int tempBoardArray[5]; int tempPlayerArray[2]; int tempPlayerAndBoardArray[7]; @@ -57,7 +57,7 @@ LocalHand::LocalHand(EngineFactory *f, GuiInterface *g, BoardInterface *b, Playe tempPlayerAndBoardArray[i+2] = cardsArray[i]; } myBoard->setMyCards(tempBoardArray); - for(i=0; idealHoleCards(); // myFlipCards auf 0 setzen - for(i=0; isetMyCardsFlip(0); } // Preflop, Flop, Turn und River erstellen - myPreflop = myFactory->createPreflop(this, myID, actualQuantityPlayers, dealerPosition, smallBlind); - myFlop = myFactory->createFlop(this, myID, actualQuantityPlayers, dealerPosition, smallBlind); - myTurn = myFactory->createTurn(this, myID, actualQuantityPlayers, dealerPosition, smallBlind); - myRiver = myFactory->createRiver(this, myID, actualQuantityPlayers, dealerPosition, smallBlind); + myPreflop = myFactory->createPreflop(this, myID, startQuantityPlayers, dealerPosition, smallBlind); + myFlop = myFactory->createFlop(this, myID, startQuantityPlayers, dealerPosition, smallBlind); + myTurn = myFactory->createTurn(this, myID, startQuantityPlayers, dealerPosition, smallBlind); + myRiver = myFactory->createRiver(this, myID, startQuantityPlayers, dealerPosition, smallBlind); //Rundenwechsel | beim ersten Durchlauf --> Preflop starten myGui->nextPlayerAnimation(); diff --git a/src/engine/local_engine/localhand.h b/src/engine/local_engine/localhand.h index b6157eaa..d63f109e 100755 --- a/src/engine/local_engine/localhand.h +++ b/src/engine/local_engine/localhand.h @@ -57,6 +57,9 @@ public: void setActualQuantityPlayers(const int& theValue) { actualQuantityPlayers = theValue; } int getActualQuantityPlayers() const { return actualQuantityPlayers; } + void setStartQuantityPlayers(const int& theValue) { startQuantityPlayers = theValue; } + int getStartQuantityPlayers() const { return startQuantityPlayers; } + void setActualRound(const int& theValue) { actualRound = theValue; } int getActualRound() const { return actualRound; } @@ -101,6 +104,7 @@ private: int myID; int actualQuantityPlayers; + int startQuantityPlayers; int dealerPosition; // -1 -> neutral int actualRound; //0 = preflop, 1 = flop, 2 = turn, 3 = river int smallBlind; diff --git a/src/gui/qt/log/log.cpp b/src/gui/qt/log/log.cpp index d24a97f5..27d4627b 100644 --- a/src/gui/qt/log/log.cpp +++ b/src/gui/qt/log/log.cpp @@ -151,10 +151,10 @@ void Log::logNewGameHandMsg(int gameID, int handID) { } if(activePlayersCounter > 2) { - for(i=0; igetActualHand()->getActualQuantityPlayers(); i++) { + for(i=0; igetActualHand()->getStartQuantityPlayers(); i++) { if(myW->getActualHand()->getPlayerArray()[i]->getMyButton() == 1) { - if(i == myW->getActualHand()->getActualQuantityPlayers()-1) { + if(i == myW->getActualHand()->getStartQuantityPlayers()-1) { stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+" (Dealer): "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$"; } else { @@ -162,7 +162,7 @@ void Log::logNewGameHandMsg(int gameID, int handID) { } } else { - if(i == myW->getActualHand()->getActualQuantityPlayers()-1) { + if(i == myW->getActualHand()->getStartQuantityPlayers()-1) { stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+": "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash()+myW->getActualHand()->getPlayerArray()[i]->getMySet(),10)+"$"; } else { @@ -172,10 +172,10 @@ void Log::logNewGameHandMsg(int gameID, int handID) { } } else { - for(i=0; igetActualHand()->getActualQuantityPlayers(); i++) { + for(i=0; igetActualHand()->getStartQuantityPlayers(); i++) { if(myW->getActualHand()->getPlayerArray()[i]->getMyButton() == 3) { - if(i == myW->getActualHand()->getActualQuantityPlayers()-1) { + if(i == myW->getActualHand()->getStartQuantityPlayers()-1) { stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+" (Dealer): "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash(),10)+"$"; } else { @@ -183,7 +183,7 @@ void Log::logNewGameHandMsg(int gameID, int handID) { } } else { - if(i == myW->getActualHand()->getActualQuantityPlayers()-1) { + if(i == myW->getActualHand()->getStartQuantityPlayers()-1) { stream << QString::fromStdString(myW->getActualHand()->getPlayerArray()[i]->getMyName())+": "+QString::number(myW->getActualHand()->getPlayerArray()[i]->getMyCash()+myW->getActualHand()->getPlayerArray()[i]->getMySet(),10)+"$"; } else { diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index c4fa3dce..3385a233 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -732,7 +732,7 @@ void mainWindowImpl::refreshButton() { if (actualHand->getPlayerArray()[k]->getMyActiveStatus() == 1) activePlayersCounter++; } - for (i=0; igetActualQuantityPlayers(); i++) { + for (i=0; igetStartQuantityPlayers(); i++) { if(activePlayersCounter > 2) { if (actualHand->getPlayerArray()[i]->getMyButton()==1) {