From 1dbff19430c1834306920ef6931ccaef67febc44 Mon Sep 17 00:00:00 2001 From: doitux Date: Mon, 6 Aug 2007 09:50:54 +0000 Subject: [PATCH] localberopostriver bugfix --- src/engine/berointerface.h | 2 +- src/engine/local_engine/localbero.h | 2 +- src/engine/local_engine/localberopostriver.cpp | 2 +- src/gui/qt/mainwindow/mainwindowimpl.cpp | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/engine/berointerface.h b/src/engine/berointerface.h index ab28e158..c075bbcb 100644 --- a/src/engine/berointerface.h +++ b/src/engine/berointerface.h @@ -30,7 +30,7 @@ public: virtual void setHighestCardsValue(int theValue) =0; virtual void resetFirstRun() =0; - virtual int getHighestCardsValue() =0; + virtual int getHighestCardsValue() const =0; virtual void preflopRun() =0; virtual void flopRun() =0; diff --git a/src/engine/local_engine/localbero.h b/src/engine/local_engine/localbero.h index a55d5ac7..50c0cf1d 100644 --- a/src/engine/local_engine/localbero.h +++ b/src/engine/local_engine/localbero.h @@ -25,7 +25,7 @@ public: int getMyBeRoID() const { return myBeRoID; } - int getHighestCardsValue() {} + int getHighestCardsValue() const {} void setHighestCardsValue(int theValue) {} //only until bero refactory is over diff --git a/src/engine/local_engine/localberopostriver.cpp b/src/engine/local_engine/localberopostriver.cpp index 16e92bca..730f91b9 100644 --- a/src/engine/local_engine/localberopostriver.cpp +++ b/src/engine/local_engine/localberopostriver.cpp @@ -29,7 +29,7 @@ LocalBeRoPostRiver::LocalBeRoPostRiver(HandInterface* bR, int id, int qP, int dP { - myBeRoID = GAME_STATE_RIVER; + myBeRoID = GAME_STATE_POST_RIVER; int i; diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 9e37b048..feb5bde0 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -1946,8 +1946,7 @@ void mainWindowImpl::postRiverRunAnimation3() { int i; HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); -// cout << "Neue Runde" << endl; - + cout << currentHand->getRiver()->getMyBeRoID() << endl; //Alle Winner erhellen und "Winner" schreiben for(i=0; igetPlayerArray()[i]->getMyActiveStatus() && currentHand->getPlayerArray()[i]->getMyAction() != 1 && currentHand->getPlayerArray()[i]->getMyCardsValueInt() == currentHand->getRiver()->getHighestCardsValue() ) {