diff --git a/data/gfx/gui/misc/handRanking.png b/data/gfx/gui/misc/handRanking.png index 779bb3f1..532984dd 100644 Binary files a/data/gfx/gui/misc/handRanking.png and b/data/gfx/gui/misc/handRanking.png differ diff --git a/src/engine/boardinterface.h b/src/engine/boardinterface.h index 15d0ed8d..01511d22 100644 --- a/src/engine/boardinterface.h +++ b/src/engine/boardinterface.h @@ -53,8 +53,8 @@ public: virtual void distributePot() =0; - virtual std::list getWinners() const =0; - virtual void setWinners(const std::list &winners) =0; + virtual std::list getWinners() const =0; + virtual void setWinners(const std::list &winners) =0; }; diff --git a/src/engine/local_engine/localboard.h b/src/engine/local_engine/localboard.h index 995a3cb1..e1a35b46 100755 --- a/src/engine/local_engine/localboard.h +++ b/src/engine/local_engine/localboard.h @@ -51,8 +51,8 @@ public: void distributePot(); - std::list getWinners() const { return winners; } - void setWinners(const std::list &w) { winners = w; } + std::list getWinners() const { return winners; } + void setWinners(const std::list &w) { winners = w; } private: @@ -62,7 +62,7 @@ private: HandInterface *currentHand; - std::list winners; + std::list winners; int myCards[5]; int pot; diff --git a/src/engine/network_engine/clientboard.cpp b/src/engine/network_engine/clientboard.cpp index caf5bacd..65091ece 100644 --- a/src/engine/network_engine/clientboard.cpp +++ b/src/engine/network_engine/clientboard.cpp @@ -118,7 +118,7 @@ ClientBoard::distributePot() } -std::list +std::list ClientBoard::getWinners() const { boost::recursive_mutex::scoped_lock lock(m_syncMutex); @@ -126,7 +126,7 @@ ClientBoard::getWinners() const } void -ClientBoard::setWinners(const std::list &w) +ClientBoard::setWinners(const std::list &w) { boost::recursive_mutex::scoped_lock lock(m_syncMutex); winners = w; diff --git a/src/engine/network_engine/clientboard.h b/src/engine/network_engine/clientboard.h index 317a5349..427a9d27 100644 --- a/src/engine/network_engine/clientboard.h +++ b/src/engine/network_engine/clientboard.h @@ -50,8 +50,8 @@ public: void distributePot(); - std::list getWinners() const; - void setWinners(const std::list &winners); + std::list getWinners() const; + void setWinners(const std::list &winners); private: mutable boost::recursive_mutex m_syncMutex; @@ -62,7 +62,7 @@ private: HandInterface *currentHand; - std::list winners; + std::list winners; int myCards[5]; int pot; diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index be980a22..c002b427 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -2582,7 +2582,7 @@ void mainWindowImpl::postRiverRunAnimation3() { } - list winners = currentHand->getBoard()->getWinners(); + list winners = currentHand->getBoard()->getWinners(); for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) { @@ -2645,8 +2645,7 @@ void mainWindowImpl::postRiverRunAnimation3() { } //Pot-Verteilung Loggen //Pro Spieler den Cash aus dem Player und dem Label auslesen. Player_cash - Label_cash = Gewinnsumme - bool toIntBool = TRUE; - int pot = (*it_c)->getMyCash() - cashLabelArray[(*it_c)->getMyID()]->text().remove(" $").toInt(&toIntBool,10) ; + int pot = (*it_c)->getLastMoneyWon(); //Wenn River dann auch das Blatt loggen! // if (textLabel_handLabel->text() == "River") { @@ -2670,14 +2669,13 @@ void mainWindowImpl::postRiverRunAnimation3() { } // log side pot winners -> TODO - list::iterator it_int; + list::iterator it_int; for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) { if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() != currentHand->getCurrentBeRo()->getHighestCardsValue() ) { for(it_int = winners.begin(); it_int != winners.end(); it_int++) { - if((*it_int) == (*it_c)->getMyID()) { - bool toIntBool = TRUE; - int pot = (*it_c)->getMyCash() - cashLabelArray[(*it_c)->getMyID()]->text().remove(" $").toInt(&toIntBool,10); + if((*it_int) == (*it_c)->getMyUniqueID()) { + int pot = (*it_c)->getLastMoneyWon(); (*it_c)->setMyWinnerState(false, pot); } } diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 289236a2..c0068aa0 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -1106,7 +1106,7 @@ ClientStateRunHand::InternalProcess(ClientThread &client, boost::shared_ptrsetMyCash(endHandData.playerMoney); tmpPlayer->setLastMoneyWon(endHandData.moneyWon); - list winnerList; + list winnerList; winnerList.push_back(tmpPlayer->getMyUniqueID()); curGame->getCurrentHand()->getBoard()->setPot(0); @@ -1137,7 +1137,7 @@ ClientStateRunHand::InternalProcess(ClientThread &client, boost::shared_ptr winnerList; + list winnerList; int highestValueOfCards = 0; while (i != end) {