playerbuttons hand after get incative bugfix

logDealBoardCards now in engine

src/engine/local_engine/localflop.cpp

@@ -23,7 +23,7 @@
 
 //using namespace std;
 
-LocalFlop::LocalFlop(HandInterface* bR, int id, int qP, int dP, int sB) : FlopInterface(), myHand(bR), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstFlopRun(1), firstFlopRound(1), firstHeadsUpFlopRound(1), playersTurn(dP)
+LocalFlop::LocalFlop(HandInterface* bR, int id, int qP, int dP, int sB) : FlopInterface(), myHand(bR), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstFlopRun(1), firstFlopRound(1), firstHeadsUpFlopRound(1), playersTurn(dP), logBoardCardsDone(0)
 
 {
 	int i;
@@ -52,6 +52,15 @@ void LocalFlop::flopRun() {
 	}
 
 	else {
+		//log the turned cards
+		if(!logBoardCardsDone) {
+			int tempBoardCardsArray[5];
+			
+			myHand->getBoard()->getMyCards(tempBoardCardsArray);
+			myHand->getGuiInterface()->logDealBoardCardsMsg(1, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2]);
+			logBoardCardsDone = 1;
+		}
+
 		bool allHighestSet = 1;
 
 		// prfe, ob alle Sets gleich sind ( falls nicht, dann allHighestSet = 0 )

src/engine/local_engine/localflop.h

@@ -68,6 +68,8 @@ private:
 	bool firstHeadsUpFlopRound;
 	int playersTurn;
 
+	bool logBoardCardsDone;
+
 };
 
 #endif

src/engine/local_engine/localhand.cpp

@@ -29,7 +29,6 @@ LocalHand::LocalHand(boost::shared_ptr<EngineFactory> f, GuiInterface *g, BoardI
 {
 
 	int i, j, k;
-	lastPlayersTurn = 0;
 
 	CardsValue myCardsValue;
 
@@ -352,7 +351,7 @@ void LocalHand::switchRounds() {
 	}
 
 	//unhighlight actual players groupbox
-	myGui->refreshGroupbox(lastPlayersTurn,1);
+	if(playerArray[lastPlayersTurn]->getMyActiveStatus() == 1) myGui->refreshGroupbox(lastPlayersTurn,1);
 
 	highlightRoundLabel();
 // 	/*/*/*/*cout <<*/*/*/*/ "NextPlayerSpeed1 stop" << endl;

src/engine/local_engine/localriver.cpp

@@ -25,7 +25,7 @@
 
 using namespace std;
 
-LocalRiver::LocalRiver(HandInterface* bR, int id, int qP, int dP, int sB) : RiverInterface(), myHand(bR), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstRiverRun(1), firstRiverRound(1), firstHeadsUpRiverRound(1), playersTurn(dP), highestCardsValue(0)
+LocalRiver::LocalRiver(HandInterface* bR, int id, int qP, int dP, int sB) : RiverInterface(), myHand(bR), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstRiverRun(1), firstRiverRound(1), firstHeadsUpRiverRound(1), playersTurn(dP), highestCardsValue(0), logBoardCardsDone(0)
 
 {	int i;
 
@@ -52,6 +52,15 @@ void LocalRiver::riverRun() {
 	}
 
 	else {
+		//log the turned cards
+		if(!logBoardCardsDone) {
+			int tempBoardCardsArray[5];
+			
+			myHand->getBoard()->getMyCards(tempBoardCardsArray);
+			myHand->getGuiInterface()->logDealBoardCardsMsg(3, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3], tempBoardCardsArray[4]);
+			logBoardCardsDone = 1;
+		}
+		
 		bool allHighestSet = 1;
 
 		// prfe, ob alle Sets gleich sind ( falls nicht, dann allHighestSet = 0 )

src/engine/local_engine/localriver.h

@@ -74,6 +74,8 @@ private:
 
 	int highestCardsValue;
 
+	bool logBoardCardsDone;
+
 };
 
 #endif

src/engine/local_engine/localturn.cpp

@@ -24,7 +24,7 @@
 
 //using namespace std;
 
-LocalTurn::LocalTurn(HandInterface* bR, int id, int qP, int dP, int sB) : TurnInterface(), myHand(bR), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstTurnRun(1), firstTurnRound(1), firstHeadsUpTurnRound(1), playersTurn(dP)
+LocalTurn::LocalTurn(HandInterface* bR, int id, int qP, int dP, int sB) : TurnInterface(), myHand(bR), myID(id), actualQuantityPlayers(qP), dealerPosition(dP), smallBlindPosition(0), smallBlind(sB), highestSet(0), firstTurnRun(1), firstTurnRound(1), firstHeadsUpTurnRound(1), playersTurn(dP), logBoardCardsDone(0)
 
 {	int i;
 
@@ -52,6 +52,15 @@ void LocalTurn::turnRun() {
 	}
 
 	else {
+		//log the turned cards
+		if(!logBoardCardsDone) {
+			int tempBoardCardsArray[5];
+			
+			myHand->getBoard()->getMyCards(tempBoardCardsArray);
+			myHand->getGuiInterface()->logDealBoardCardsMsg(2, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3]);
+			logBoardCardsDone = 1;
+		}
+		
 		bool allHighestSet = 1;
 
 		// prfe, ob alle Sets gleich sind ( falls nicht, dann allHighestSet = 0 )

src/engine/local_engine/localturn.h

@@ -66,6 +66,8 @@ private:
 	bool firstHeadsUpTurnRound;
 	int playersTurn;
 
+	bool logBoardCardsDone;
+
 };
 
 #endif

src/gui/generic/serverguiwrapper.cpp

@@ -94,6 +94,9 @@ void ServerGuiWrapper::meInAction() {}
 
 void ServerGuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) {}
 void ServerGuiWrapper::logNewGameHandMsg(int gameID, int handID) {}
+void ServerGuiWrapper::logPlayerWinsMsg(int playerID, int pot) {}
+void ServerGuiWrapper::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4, int card5) {}
+void ServerGuiWrapper::logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt, std::string showHas) {}
 
 void ServerGuiWrapper::SignalNetClientConnect(int actionID) { if (myClientcb) myClientcb->SignalNetClientConnect(actionID); }
 void ServerGuiWrapper::SignalNetClientGameInfo(int actionID) { if (myClientcb) myClientcb->SignalNetClientGameInfo(actionID); }

src/gui/generic/serverguiwrapper.h

@@ -77,6 +77,9 @@ public:
 
 	void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
 	void logNewGameHandMsg(int gameID, int handID) ;
+	void logPlayerWinsMsg(int playerID, int pot);
+	void logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1) ;
+	void logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows") ;
 
 	void SignalNetClientConnect(int actionID);
 	void SignalNetClientGameInfo(int actionID);

src/gui/guiinterface.h

@@ -88,6 +88,9 @@ public:
 	//log.cpp
 	virtual void logPlayerActionMsg(std::string playName, int action, int setValue) =0;
 	virtual void logNewGameHandMsg(int gameID, int HandID) =0;
+	virtual	void logPlayerWinsMsg(int playerID, int pot) = 0;
+	virtual void logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1) = 0;
+	virtual void logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows") = 0;
 };
 
 #endif

src/gui/qt/guiwrapper.cpp

@@ -92,6 +92,10 @@ void GuiWrapper::meInAction() { myW->signalMeInAction(); }
 
 void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) { myLog->signalLogPlayerActionMsg(QString::fromUtf8(playerName.c_str()), action, setValue); }
 void GuiWrapper::logNewGameHandMsg(int gameID, int handID) { myLog->signalLogNewGameHandMsg(gameID, handID); }
+void GuiWrapper::logPlayerWinsMsg(int playerID, int pot) { myLog->signalLogPlayerWinsMsg(playerID, pot); }
+void GuiWrapper::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4, int card5) { myLog->signalLogDealBoardCardsMsg(roundID, card1, card2, card3, card4, card5); }
+void GuiWrapper::logFlipHoleCardsMsg(string playerName, int card1, int card2, int cardsValueInt, string showHas) { myLog->signalLogFlipHoleCardsMsg(playerName, card1, card2, cardsValueInt, showHas); }
+
 
 void GuiWrapper::SignalNetClientConnect(int actionID) { myW->signalNetClientConnect(actionID); }
 void GuiWrapper::SignalNetClientGameInfo(int actionID) { myW->signalNetClientGameInfo(actionID); }

src/gui/qt/guiwrapper.h

@@ -85,6 +85,9 @@ public:
 
 	void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
 	void logNewGameHandMsg(int gameID, int handID) ;
+	void logPlayerWinsMsg(int playerID, int pot);
+	void logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1);
+	void logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows");
 
 	void SignalNetClientConnect(int actionID);
 	void SignalNetClientGameInfo(int actionID);

src/gui/qt/mainwindow/log/log.cpp

@@ -33,6 +33,9 @@ Log::Log(mainWindowImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), m
 
 	connect(this, SIGNAL(signalLogPlayerActionMsg(QString, int, int)), this, SLOT(logPlayerActionMsg(QString, int, int)));
 	connect(this, SIGNAL(signalLogNewGameHandMsg(int, int)), this, SLOT(logNewGameHandMsg(int, int)));
+	connect(this, SIGNAL(signalLogPlayerWinsMsg(int, int)), this, SLOT(logPlayerWinsMsg(int, int)));
+	connect(this, SIGNAL(signalLogDealBoardCardsMsg(int, int, int, int, int, int)), this, SLOT(logDealBoardCardsMsg(int, int, int, int, int, int)));
+	connect(this, SIGNAL(signalLogFlipHoleCardsMsg(std::string, int, int, int, std::string)), this, SLOT(logFlipHoleCardsMsg(std::string, int, int, int, std::string)));
 
 	logFileStreamString = "";
 	lastGameID = 0;
@@ -300,7 +303,7 @@ void Log::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int
 	}
 }
 
-void Log::logFlipHoleCardsMsg(QString playerName, int card1, int card2, int cardsValueInt, string showHas) {
+void Log::logFlipHoleCardsMsg(string playerName, int card1, int card2, int cardsValueInt, string showHas) {
 
 	if (cardsValueInt != -1) {
 	
@@ -407,12 +410,12 @@ void Log::logFlipHoleCardsMsg(QString playerName, int card1, int card2, int card
 			default: {}
 		}
 
-		myW->textBrowser_Log->append(playerName+" "+QString::fromUtf8(showHas.c_str())+" \""+tempHandName+"\"");
+		myW->textBrowser_Log->append(QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" \""+tempHandName+"\"");
 
 		if(myConfig->readConfigInt("LogOnOff")) {
 		//if write logfiles is enabled
 
-			logFileStreamString += playerName+" "+QString::fromUtf8(showHas.c_str())+" [ <b>"+translateCardCode(card1).at(0)+"</b>"+translateCardCode(card1).at(1)+",<b>"+translateCardCode(card2).at(0)+"</b>"+translateCardCode(card2).at(1)+"] - "+tempHandName+"</br>\n";
+			logFileStreamString += QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" [ <b>"+translateCardCode(card1).at(0)+"</b>"+translateCardCode(card1).at(1)+",<b>"+translateCardCode(card2).at(0)+"</b>"+translateCardCode(card2).at(1)+"] - "+tempHandName+"</br>\n";
 	
 			if(myConfig->readConfigInt("LogInterval") == 0) {		
 				writeLogFileStream(logFileStreamString);
@@ -422,12 +425,12 @@ void Log::logFlipHoleCardsMsg(QString playerName, int card1, int card2, int card
 		}
 	}
 	else {
-		myW->textBrowser_Log->append(playerName+" "+QString::fromUtf8(showHas.c_str())+" ["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+"]");
+		myW->textBrowser_Log->append(QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" ["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+"]");
 		
 		if(myConfig->readConfigInt("LogOnOff")) {
 		//if write logfiles is enabled
 
-			logFileStreamString += playerName+" "+QString::fromUtf8(showHas.c_str())+" [<b>"+translateCardCode(card1).at(0)+"</b>"+translateCardCode(card1).at(1)+",<b>"+translateCardCode(card2).at(0)+"</b>"+translateCardCode(card2).at(1)+"]"+"</br>\n";
+			logFileStreamString += QString::fromUtf8(playerName.c_str())+" "+QString::fromUtf8(showHas.c_str())+" [<b>"+translateCardCode(card1).at(0)+"</b>"+translateCardCode(card1).at(1)+",<b>"+translateCardCode(card2).at(0)+"</b>"+translateCardCode(card2).at(1)+"]"+"</br>\n";
 			if(myConfig->readConfigInt("LogInterval") == 0) {		
 				writeLogFileStream(logFileStreamString);
 				logFileStreamString = "";

src/gui/qt/mainwindow/log/log.h

@@ -45,7 +45,7 @@ public slots:
 	void logNewGameHandMsg(int gameID, int handID);
 	void logPlayerWinsMsg(int playerID, int pot);
 	void logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1);
-	void logFlipHoleCardsMsg(QString playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows");
+	void logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows");
 
 public:
 	QStringList translateCardsValueCode(int cardsValueCode);
@@ -56,6 +56,10 @@ public:
 signals:
 	void signalLogPlayerActionMsg(QString playerName, int action, int setValue);
 	void signalLogNewGameHandMsg(int gameID, int handID);
+	void signalLogPlayerWinsMsg(int playerID, int pot);
+	void signalLogDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4 = -1, int card5 = -1);
+	void signalLogFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt = -1, std::string showHas = "shows");
+
 
 private:
 	int lastGameID;

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -672,6 +672,9 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) {
 	Tools::getRandNumber(0, gameData.numberOfPlayers-1, 1, &tmpDealerPos, 0);
 	startData.startDealerPlayerId = static_cast<unsigned>(tmpDealerPos);
 
+	//remove ChatWindow
+	tab_Chat->hide();
+
 	//Start Game!!!
 	mySession->startLocalGame(gameData, startData);
 }
@@ -861,12 +864,7 @@ void mainWindowImpl::initGui(int speed)
 }
 
 Session &mainWindowImpl::getSession() { assert(mySession.get()); return *mySession; }
-
+void mainWindowImpl::setSession(boost::shared_ptr<Session> session) { mySession = session; }
-void mainWindowImpl::setSession(boost::shared_ptr<Session> session)
-{
-	mySession = session;
-}
-
 
 
 //refresh-Funktionen
@@ -1314,7 +1312,6 @@ void mainWindowImpl::dealFlopCards6() {
 		boardCardsArray[2]->setPixmap(card, FALSE);
 	}
 	
-	myLog->logDealBoardCardsMsg(1, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2]);
 	// stable
 	// wenn alle All In
 	if(mySession->getCurrentGame()->getCurrentHand()->getAllInCondition()) { dealFlopCards6Timer->start(AllInDealCardsSpeed); }
@@ -1348,7 +1345,6 @@ void mainWindowImpl::dealTurnCards2() {
 		boardCardsArray[3]->setPixmap(card, FALSE);
 	}
 	
-	myLog->logDealBoardCardsMsg(2, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3]);
 	// stable
 	// wenn alle All In
 	if(mySession->getCurrentGame()->getCurrentHand()->getAllInCondition()) { dealTurnCards2Timer->start(AllInDealCardsSpeed);
@@ -1384,7 +1380,6 @@ void mainWindowImpl::dealRiverCards2() {
 		boardCardsArray[4]->setPixmap(card, FALSE);
 	}
 
-	myLog->logDealBoardCardsMsg(3, tempBoardCardsArray[0], tempBoardCardsArray[1], tempBoardCardsArray[2], tempBoardCardsArray[3], tempBoardCardsArray[4]);
 	// stable
 	// wenn alle All In
 	if(mySession->getCurrentGame()->getCurrentHand()->getAllInCondition()) { dealRiverCards2Timer->start(AllInDealCardsSpeed);	}
@@ -1826,7 +1821,7 @@ void mainWindowImpl::postRiverRunAnimation2() {
 							}	
 						}
 						//Karten umdrehen Loggen 
-						myLog->logFlipHoleCardsMsg(QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str()), tempCardsIntArray[0], tempCardsIntArray[1], currentHand->getPlayerArray()[i]->getMyCardsValueInt());
+						myLog->logFlipHoleCardsMsg(currentHand->getPlayerArray()[i]->getMyName(), tempCardsIntArray[0], tempCardsIntArray[1], currentHand->getPlayerArray()[i]->getMyCardsValueInt());
 			
 						currentHand->getPlayerArray()[i]->setMyCardsFlip(1);
 					}
@@ -1854,7 +1849,7 @@ void mainWindowImpl::postRiverRunAnimation2() {
 							}	
 						}
 						//Karten umdrehen Loggen 
-						myLog->logFlipHoleCardsMsg(QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str()), tempCardsIntArray[0], tempCardsIntArray[1], currentHand->getPlayerArray()[i]->getMyCardsValueInt() );
+						myLog->logFlipHoleCardsMsg(currentHand->getPlayerArray()[i]->getMyName(), tempCardsIntArray[0], tempCardsIntArray[1], currentHand->getPlayerArray()[i]->getMyCardsValueInt() );
 
 						currentHand->getPlayerArray()[i]->setMyCardsFlip(1);
 					}
@@ -1871,7 +1866,7 @@ void mainWindowImpl::postRiverRunAnimation2() {
 				if(currentHand->getPlayerArray()[i]->getMyActiveStatus() && currentHand->getPlayerArray()[i]->getMyAction() != 1) { 
 				
 					//Kartenwerte Loggen 
-					myLog->logFlipHoleCardsMsg(QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str()), tempCardsIntArray[0], tempCardsIntArray[1], currentHand->getPlayerArray()[i]->getMyCardsValueInt(), "has");
+					myLog->logFlipHoleCardsMsg(currentHand->getPlayerArray()[i]->getMyName(), tempCardsIntArray[0], tempCardsIntArray[1], currentHand->getPlayerArray()[i]->getMyCardsValueInt(), "has");
 				}
 			}	
 		}
@@ -2089,7 +2084,7 @@ void mainWindowImpl::flipHolecardsAllIn() {
 							}
 						}
 						//Karten umdrehen Loggen 
-						myLog->logFlipHoleCardsMsg(QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str()), tempCardsIntArray[0], tempCardsIntArray[1]);
+						myLog->logFlipHoleCardsMsg(currentHand->getPlayerArray()[i]->getMyName(), tempCardsIntArray[0], tempCardsIntArray[1]);
 
 						currentHand->getPlayerArray()[i]->setMyCardsFlip(1);
 						
@@ -2118,7 +2113,7 @@ void mainWindowImpl::flipHolecardsAllIn() {
 							}	
 						}
 						//Karten umdrehen Loggen 
-						myLog->logFlipHoleCardsMsg(QString::fromUtf8(currentHand->getPlayerArray()[i]->getMyName().c_str()), temp2CardsIntArray[0], temp2CardsIntArray[1] );
+						myLog->logFlipHoleCardsMsg(currentHand->getPlayerArray()[i]->getMyName(), temp2CardsIntArray[0], temp2CardsIntArray[1] );
 				
 						currentHand->getPlayerArray()[i]->setMyCardsFlip(1);
 					}
@@ -2140,7 +2135,7 @@ void mainWindowImpl::showMyCards() {
 	currentHand->getPlayerArray()[0]->getMyCards(tempCardsIntArray);	
 	if( currentHand->getPlayerArray()[0]->getMyCardsFlip() == 0 &&  currentHand->getActualRound() == 4 && currentHand->getPlayerArray()[0]->getMyActiveStatus() && currentHand->getPlayerArray()[0]->getMyAction() != 1) { 
 		//Karten umdrehen Loggen 
-		myLog->logFlipHoleCardsMsg(QString::fromUtf8(currentHand->getPlayerArray()[0]->getMyName().c_str()), tempCardsIntArray[0], tempCardsIntArray[1], currentHand->getPlayerArray()[0]->getMyCardsValueInt() );
+		myLog->logFlipHoleCardsMsg(currentHand->getPlayerArray()[0]->getMyName().c_str(), tempCardsIntArray[0], tempCardsIntArray[1], currentHand->getPlayerArray()[0]->getMyCardsValueInt() );
 
 		currentHand->getPlayerArray()[0]->setMyCardsFlip(1);
 	}