sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
doitux
2012-11-27 00:53:51 +01:00
parent e76ecc8fc6 d48c9f59c7
commit b84888b61c
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gametable/gametableimpl.cpp
+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) {
src/gui/qt/sound/soundevents.h
+5
View File
@@ -15,6 +15,11 @@ public:
void newGameStarts();
void playSound(std::string audioString, int playerID);
protected:
// Prevent copy construction.
// This is only a declaration.
SoundEvents(const SoundEvents &);
private:
SDLPlayer *mySDLPlayer;
ConfigFile *myConfig;