Merge remote-tracking branch 'origin/master'

This commit is contained in:
doitux
2012-11-27 00:53:51 +01:00
5 changed files with 14 additions and 12 deletions
+2 -5
View File
@@ -2023,11 +2023,9 @@ void gameTableImpl::myCheck()
int gameTableImpl::getMyCallAmount()
{
int tempHighestSet = 0;
boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand();
boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front();
tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet();
int tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet();
if (humanPlayer->getMyCash() + humanPlayer->getMySet() <= tempHighestSet) {
@@ -2065,11 +2063,10 @@ int gameTableImpl::getMyBetAmount()
void gameTableImpl::myCall()
{
int tempHighestSet = 0;
boost::shared_ptr<HandInterface> currentHand = myStartWindow->getSession()->getCurrentGame()->getCurrentHand();
boost::shared_ptr<PlayerInterface> humanPlayer = currentHand->getSeatsList()->front();
tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet();
int tempHighestSet = currentHand->getCurrentBeRo()->getHighestSet();
if (humanPlayer->getMyCash() + humanPlayer->getMySet() <= tempHighestSet) {