From fb94675aee520cb3921fa8ce5c2fca5cd03ccc9d Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 18 Dec 2011 22:34:55 +0000 Subject: [PATCH] another way to initialize stayOnTableStatus for player-objects --- src/engine/enginefactory.h | 2 +- src/engine/game.cpp | 2 +- src/engine/local_engine/localenginefactory.cpp | 4 ++-- src/engine/local_engine/localenginefactory.h | 2 +- src/engine/local_engine/localplayer.cpp | 4 ++-- src/engine/local_engine/localplayer.h | 2 +- src/engine/network_engine/clientenginefactory.cpp | 4 ++-- src/engine/network_engine/clientenginefactory.h | 2 +- src/engine/network_engine/clientplayer.cpp | 4 ++-- src/engine/network_engine/clientplayer.h | 2 +- src/gui/qt/gametable/gametableimpl.cpp | 4 +++- src/gui/qt/startwindow/startwindowimpl.cpp | 2 +- 12 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/engine/enginefactory.h b/src/engine/enginefactory.h index d7fcf87a..9dd78843 100644 --- a/src/engine/enginefactory.h +++ b/src/engine/enginefactory.h @@ -33,7 +33,7 @@ public: virtual boost::shared_ptr createHand(boost::shared_ptr f, GuiInterface *g, boost::shared_ptr b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC) =0; virtual boost::shared_ptr createBoard(unsigned dp) =0; - virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) =0; + virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB) =0; virtual std::vector > createBeRo(HandInterface *hi, unsigned dP, int sB) =0; }; diff --git a/src/engine/game.cpp b/src/engine/game.cpp index 2f04568b..86158438 100755 --- a/src/engine/game.cpp +++ b/src/engine/game.cpp @@ -95,7 +95,7 @@ Game::Game(GuiInterface* gui, boost::shared_ptr factory, } // create player objects - boost::shared_ptr tmpPlayer = myFactory->createPlayer(i, uniqueId, type, myName, myAvatarFile, myStartCash, startQuantityPlayers > i, 0); + boost::shared_ptr tmpPlayer = myFactory->createPlayer(i, uniqueId, type, myName, myAvatarFile, myStartCash, startQuantityPlayers > i, startQuantityPlayers > i, 0); tmpPlayer->setIsSessionActive(true); tmpPlayer->setMyGuid(myGuid); diff --git a/src/engine/local_engine/localenginefactory.cpp b/src/engine/local_engine/localenginefactory.cpp index b0394d69..16e5e6f8 100644 --- a/src/engine/local_engine/localenginefactory.cpp +++ b/src/engine/local_engine/localenginefactory.cpp @@ -54,9 +54,9 @@ LocalEngineFactory::createBoard(unsigned dp) } boost::shared_ptr -LocalEngineFactory::createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) +LocalEngineFactory::createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB) { - return boost::shared_ptr (new LocalPlayer(myConfig, id, uniqueId, type, name, avatar, sC, aS, mB)); + return boost::shared_ptr (new LocalPlayer(myConfig, id, uniqueId, type, name, avatar, sC, aS, sotS, mB)); } std::vector > diff --git a/src/engine/local_engine/localenginefactory.h b/src/engine/local_engine/localenginefactory.h index 2346e739..dc2947c9 100644 --- a/src/engine/local_engine/localenginefactory.h +++ b/src/engine/local_engine/localenginefactory.h @@ -38,7 +38,7 @@ public: virtual boost::shared_ptr createHand(boost::shared_ptr f, GuiInterface *g, boost::shared_ptr b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC); virtual boost::shared_ptr createBoard(unsigned dp); - virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); + virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB); virtual std::vector > createBeRo(HandInterface *hi, unsigned dP, int sB); private: diff --git a/src/engine/local_engine/localplayer.cpp b/src/engine/local_engine/localplayer.cpp index a7b8134b..1c82feae 100755 --- a/src/engine/local_engine/localplayer.cpp +++ b/src/engine/local_engine/localplayer.cpp @@ -845,10 +845,10 @@ static const RoundData FlopValues[] = { #define NUM_PREFLOP_VALUES (sizeof(PreflopValues)/sizeof(RoundData)) #define NUM_FLOP_VALUES (sizeof(FlopValues)/sizeof(RoundData)) -LocalPlayer::LocalPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) +LocalPlayer::LocalPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB) : PlayerInterface(), myConfig(c), currentHand(0), myID(id), myUniqueID(uniqueId), myType(type), myName(name), myAvatar(avatar), myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), logHoleCardsDone(false), myCash(sC), mySet(0), myLastRelativeSet(0), myAction(PLAYER_ACTION_NONE), - myButton(mB), myActiveStatus(aS), myStayOnTableStatus(1), myTurn(0), myCardsFlip(0), myRoundStartCash(0), lastMoneyWon(0), + myButton(mB), myActiveStatus(aS), myStayOnTableStatus(sotS), myTurn(0), myCardsFlip(0), myRoundStartCash(0), lastMoneyWon(0), sBluff(0), sBluffStatus(false), m_actionTimeoutCounter(0), m_isSessionActive(false), m_isKicked(false) { diff --git a/src/engine/local_engine/localplayer.h b/src/engine/local_engine/localplayer.h index af548d6b..dc0e7837 100755 --- a/src/engine/local_engine/localplayer.h +++ b/src/engine/local_engine/localplayer.h @@ -31,7 +31,7 @@ class HandInterface; class LocalPlayer : public PlayerInterface { public: - LocalPlayer(ConfigFile*, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); + LocalPlayer(ConfigFile*, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB); ~LocalPlayer(); diff --git a/src/engine/network_engine/clientenginefactory.cpp b/src/engine/network_engine/clientenginefactory.cpp index 05ea3ae4..a23a3fc2 100644 --- a/src/engine/network_engine/clientenginefactory.cpp +++ b/src/engine/network_engine/clientenginefactory.cpp @@ -48,9 +48,9 @@ ClientEngineFactory::createBoard(unsigned dp) } boost::shared_ptr -ClientEngineFactory::createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) +ClientEngineFactory::createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB) { - return boost::shared_ptr(new ClientPlayer(NULL, id, uniqueId, type, name, avatar, sC, aS, mB)); + return boost::shared_ptr(new ClientPlayer(NULL, id, uniqueId, type, name, avatar, sC, aS, sotS, mB)); } std::vector > diff --git a/src/engine/network_engine/clientenginefactory.h b/src/engine/network_engine/clientenginefactory.h index e2ccf417..e17ca808 100644 --- a/src/engine/network_engine/clientenginefactory.h +++ b/src/engine/network_engine/clientenginefactory.h @@ -40,7 +40,7 @@ public: virtual boost::shared_ptr createHand(boost::shared_ptr f, GuiInterface *g, boost::shared_ptr b, Log *l, PlayerList sl, PlayerList apl, PlayerList rpl, int id, int sP, int dP, int sB,int sC); virtual boost::shared_ptr createBoard(unsigned dp); - virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); + virtual boost::shared_ptr createPlayer(int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB); virtual std::vector > createBeRo(HandInterface *hi, unsigned dP, int sB); }; diff --git a/src/engine/network_engine/clientplayer.cpp b/src/engine/network_engine/clientplayer.cpp index f4c0e330..dc6ec745 100644 --- a/src/engine/network_engine/clientplayer.cpp +++ b/src/engine/network_engine/clientplayer.cpp @@ -22,10 +22,10 @@ using namespace std; -ClientPlayer::ClientPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB) +ClientPlayer::ClientPlayer(ConfigFile *c, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB) : PlayerInterface(), myConfig(c), currentHand(0), myID(id), myUniqueID(uniqueId), myType(type), myName(name), myAvatar(avatar), myDude(0), myDude4(0), myCardsValueInt(0), myOdds(-1.0), logHoleCardsDone(false), myCash(sC), mySet(0), myLastRelativeSet(0), - myAction(PLAYER_ACTION_NONE), myButton(mB), myActiveStatus(aS), myStayOnTableStatus(true), myTurn(false), myCardsFlip(false), myRoundStartCash(0), + myAction(PLAYER_ACTION_NONE), myButton(mB), myActiveStatus(aS), myStayOnTableStatus(sotS), myTurn(false), myCardsFlip(false), myRoundStartCash(0), lastMoneyWon(0), sBluff(0), sBluffStatus(false), m_isSessionActive(false), m_isKicked(false) { myBestHandPosition[0] = myBestHandPosition[1] = myBestHandPosition[2] = myBestHandPosition[3] = myBestHandPosition[4] = 0; diff --git a/src/engine/network_engine/clientplayer.h b/src/engine/network_engine/clientplayer.h index 8579bd3d..820204ce 100644 --- a/src/engine/network_engine/clientplayer.h +++ b/src/engine/network_engine/clientplayer.h @@ -31,7 +31,7 @@ class HandInterface; class ClientPlayer : public PlayerInterface { public: - ClientPlayer(ConfigFile*, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, int mB); + ClientPlayer(ConfigFile*, int id, unsigned uniqueId, PlayerType type, std::string name, std::string avatar, int sC, bool aS, bool sotS, int mB); ~ClientPlayer(); void setHand(HandInterface *); diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 58a4b3b9..556db6df 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -968,10 +968,12 @@ void gameTableImpl::refreshPlayerAvatar() } break; case SEAT_AUTOFOLD: { + qDebug() << seatPlace << "AUTOFOLD"; playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmapAndCountry(avatarPic, countryString, seatPlace, TRUE); } break; case SEAT_STAYONTABLE: { + qDebug() << seatPlace << "STAYONTABLE"; playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmapAndCountry(avatarPic, countryString, seatPlace, TRUE); } break; @@ -1087,8 +1089,8 @@ void gameTableImpl::refreshCash() } break; case SEAT_AUTOFOLD: { - cashLabelArray[(*it_c)->getMyID()]->setText("$"+QString("%L1").arg((*it_c)->getMyCash())); cashLabelArray[(*it_c)->getMyID()]->setGraphicsEffect(&opacity); + cashLabelArray[(*it_c)->getMyID()]->setText("$"+QString("%L1").arg((*it_c)->getMyCash())); } break; case SEAT_STAYONTABLE: { diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index f3d50bef..3b4d72b2 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -592,7 +592,7 @@ void startWindowImpl::callSettingsDialog() void startWindowImpl::showTimeoutDialog(int msgID, unsigned duration) { - + qDebug() << "show timeout"; if(myTimeoutDialog->isHidden()) { myTimeoutDialog->setMySession(mySession); myTimeoutDialog->setMsgID((NetTimeoutReason)msgID);