diff --git a/src/engine/local_engine/localbero.cpp b/src/engine/local_engine/localbero.cpp index 4a2f64fe..10bbc15d 100644 --- a/src/engine/local_engine/localbero.cpp +++ b/src/engine/local_engine/localbero.cpp @@ -96,10 +96,11 @@ void LocalBeRo::run() PlayerListIterator it_1, it_2; - // running player before smallBlind - bool formerRunningPlayerFound = false; if(myHand->getActivePlayerList()->size() > 2) { + // running player before smallBlind + bool formerRunningPlayerFound = false; + it_1 = myHand->getActivePlayerIt(smallBlindPositionId); if(it_1 == myHand->getActivePlayerList()->end()) { throw LocalException(__FILE__, __LINE__, ERR_ACTIVE_PLAYER_NOT_FOUND); diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index c1bf9d97..1c571904 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -2028,11 +2028,9 @@ void gameTableImpl::myCheck() int gameTableImpl::getMyCallAmount() { - int tempHighestSet = 0; - boost::shared_ptr currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand(); boost::shared_ptr humanPlayer = currentHand->getSeatsList()->front(); - tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet(); + int tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet(); if (humanPlayer->getMyCash() + humanPlayer->getMySet() <= tempHighestSet) { @@ -2070,11 +2068,10 @@ int gameTableImpl::getMyBetAmount() void gameTableImpl::myCall() { - int tempHighestSet = 0; boost::shared_ptr currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand(); boost::shared_ptr humanPlayer = currentHand->getSeatsList()->front(); - tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet(); + int tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet(); if (humanPlayer->getMyCash() + humanPlayer->getMySet() <= tempHighestSet) { diff --git a/src/gui/qt/sound/soundevents.h b/src/gui/qt/sound/soundevents.h index b6665b4c..a0f79704 100644 --- a/src/gui/qt/sound/soundevents.h +++ b/src/gui/qt/sound/soundevents.h @@ -12,6 +12,11 @@ public: void blindsWereSet(int sB); void newGameStarts(); +protected: + // Prevent copy construction. + // This is only a declaration. + SoundEvents(const SoundEvents &); + private: SDLPlayer *mySDLPlayer; ConfigFile *myConfig;