From 9c2d3a9723554e38a5536918f012fb9c156c6699 Mon Sep 17 00:00:00 2001 From: doitux Date: Sat, 26 May 2007 12:40:45 +0000 Subject: [PATCH] logging playerAction in engine now --- src/engine/local_engine/localhand.cpp | 3 +- src/engine/local_engine/localplayer.h | 6 ++- src/game.cpp | 10 +++-- src/gui/qt/mainwindow/mainwindowimpl.cpp | 50 +++++++++++++++--------- src/gui/qt/mainwindow/mainwindowimpl.h | 2 + 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp index 2c74af72..174d4766 100755 --- a/src/engine/local_engine/localhand.cpp +++ b/src/engine/local_engine/localhand.cpp @@ -25,7 +25,7 @@ using namespace std; LocalHand::LocalHand(boost::shared_ptr f, GuiInterface *g, BoardInterface *b, PlayerInterface **p, int id, int sP, int aP, 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(aP), startQuantityPlayers(sP), dealerPosition(dP), actualRound(0), smallBlind(sB), startCash(sC), allInCondition(0), bettingRoundsPlayed(0) +: HandInterface(), myFactory(f), myGui(g), myBoard(b), playerArray(p), myPreflop(0), myFlop(0), myTurn(0), myRiver(0), myID(id), actualQuantityPlayers(aP), startQuantityPlayers(sP), dealerPosition(dP), actualRound(0), smallBlind(sB), startCash(sC), lastPlayersTurn(0), allInCondition(0), bettingRoundsPlayed(0) { int i, j, k; @@ -272,6 +272,7 @@ void LocalHand::assignButtons() { void LocalHand::switchRounds() { + int i; // cout <<" ------- HandID: " << myID << " | actualround: " << actualRound << " ---------" << endl; diff --git a/src/engine/local_engine/localplayer.h b/src/engine/local_engine/localplayer.h index 0def2a74..e445fc16 100755 --- a/src/engine/local_engine/localplayer.h +++ b/src/engine/local_engine/localplayer.h @@ -64,7 +64,11 @@ public: int getMySet() const { return mySet;} int getMyLastRelativeSet() const { return myLastRelativeSet; } - void setMyAction(int theValue) { myAction = theValue; } + void setMyAction(int theValue) { + myAction = theValue; + // logging for human player + if(myAction) actualHand->getGuiInterface()->logPlayerActionMsg(myName, myAction, mySet); + } int getMyAction() const { return myAction; } void setMyButton(int theValue) { myButton = theValue; } diff --git a/src/game.cpp b/src/game.cpp index da1304e6..229a6e36 100755 --- a/src/game.cpp +++ b/src/game.cpp @@ -138,10 +138,7 @@ void Game::initHand() // smallBlind alle x Runden erhöhen if(actualHandID%(startHandsBeforeRaiseSmallBlind+1) == 0) { actualSmallBlind *= 2; } - //Spieler Action auf 0 setzen - for(i=0; isetMyAction(0); - } + // Spieler mit leerem Cash auf inactive setzen for(i=0; icreateHand(myFactory, myGui, actualBoard, playerArray, actualHandID, startQuantityPlayers, actualQuantityPlayers, dealerPosition, actualSmallBlind, startCash); + //Spieler Action auf 0 setzen + for(i=0; isetMyAction(0); + } + // Dealer-Button weiterschieben --> Achtung inactive do { dealerPosition = (dealerPosition+1)%(MAX_NUMBER_OF_PLAYERS); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 03685d83..19464d51 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -55,7 +55,7 @@ using namespace std; mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) - : QMainWindow(parent), myConfig(c), gameSpeed(0), debugMode(0), breakAfterActualHand(FALSE) + : QMainWindow(parent), myConfig(c), gameSpeed(0), myActionIsBet(0), myActionIsRaise(0), debugMode(0), breakAfterActualHand(FALSE) { int i; @@ -1496,8 +1496,8 @@ void mainWindowImpl::myFold(){ currentHand->getPlayerArray()[0]->setMyAction(1); currentHand->getPlayerArray()[0]->setMyTurn(0); - //Action in LogWindow - myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); +// //Action in LogWindow +// myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); holeCardsArray[0][0]->startFadeOut(10); holeCardsArray[0][1]->startFadeOut(10); @@ -1514,11 +1514,12 @@ void mainWindowImpl::myFold(){ void mainWindowImpl::myCheck() { HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); - currentHand->getPlayerArray()[0]->setMyAction(2); + currentHand->getPlayerArray()[0]->setMyTurn(0); + currentHand->getPlayerArray()[0]->setMyAction(2); - //Action in LogWindow - myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); +// //Action in LogWindow +// myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); disableMyButtons(); @@ -1550,9 +1551,9 @@ void mainWindowImpl::myCall(){ if (currentHand->getPlayerArray()[0]->getMyCash()+currentHand->getPlayerArray()[0]->getMySet() <= tempHighestSet) { - currentHand->getPlayerArray()[0]->setMyAction(6); currentHand->getPlayerArray()[0]->setMySet(currentHand->getPlayerArray()[0]->getMyCash()); currentHand->getPlayerArray()[0]->setMyCash(0); + currentHand->getPlayerArray()[0]->setMyAction(6); } else { currentHand->getPlayerArray()[0]->setMySet(tempHighestSet - currentHand->getPlayerArray()[0]->getMySet()); @@ -1563,8 +1564,8 @@ void mainWindowImpl::myCall(){ currentHand->getBoard()->collectSets(); refreshPot(); - //Action in LogWindow - myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); +// //Action in LogWindow +// myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); disableMyButtons(); @@ -1594,7 +1595,7 @@ void mainWindowImpl::myBet(){ spinBox_set->setFocus(); spinBox_set->selectAll(); - currentHand->getPlayerArray()[0]->setMyAction(4); + myActionIsBet = 1; } void mainWindowImpl::myRaise(){ @@ -1624,8 +1625,8 @@ void mainWindowImpl::myRaise(){ spinBox_set->setValue(spinBox_set->minimum()); spinBox_set->setFocus(); spinBox_set->selectAll(); - - currentHand->getPlayerArray()[0]->setMyAction(5); + + myActionIsRaise = 1; } void mainWindowImpl::mySet(){ @@ -1638,10 +1639,11 @@ void mainWindowImpl::mySet(){ // cout << "MySET " << currentHand->getPlayerArray()[0]->getMySet() << endl; if (spinBox_set->value() >= tempCash ) { - currentHand->getPlayerArray()[0]->setMyAction(6); currentHand->getPlayerArray()[0]->setMySet(currentHand->getPlayerArray()[0]->getMyCash()); currentHand->getPlayerArray()[0]->setMyCash(0); + currentHand->getPlayerArray()[0]->setMyAction(6); } + switch (currentHand->getActualRound()) { @@ -1656,13 +1658,23 @@ void mainWindowImpl::mySet(){ default: {} } + if(myActionIsRaise) { + currentHand->getPlayerArray()[0]->setMyAction(5); + myActionIsRaise = 0; + } + + if(myActionIsBet) { + currentHand->getPlayerArray()[0]->setMyAction(4); + myActionIsBet = 0; + } + currentHand->getPlayerArray()[0]->setMyTurn(0); currentHand->getBoard()->collectSets(); refreshPot(); - //Action in LogWindow - myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); +// //Action in LogWindow +// myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); disableMyButtons(); @@ -1676,10 +1688,12 @@ void mainWindowImpl::mySet(){ } void mainWindowImpl::myAllIn(){ + HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); - currentHand->getPlayerArray()[0]->setMyAction(6); + currentHand->getPlayerArray()[0]->setMySet(currentHand->getPlayerArray()[0]->getMyCash()); currentHand->getPlayerArray()[0]->setMyCash(0); + currentHand->getPlayerArray()[0]->setMyAction(6); switch (currentHand->getActualRound()) { @@ -1699,8 +1713,8 @@ void mainWindowImpl::myAllIn(){ currentHand->getBoard()->collectSets(); refreshPot(); - //Action in LogWindow - myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); +// //Action in LogWindow +// myLog->logPlayerActionMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), currentHand->getPlayerArray()[0]->getMyAction(), currentHand->getPlayerArray()[0]->getMySet()); disableMyButtons(); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index e571f5d6..2546d49d 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -358,6 +358,8 @@ private: int preflopNextPlayerSpeed; int nextOpponentSpeed; + bool myActionIsBet; + bool myActionIsRaise; bool debugMode; bool breakAfterActualHand;