cleanup game logging; delete old code and disused defines

src/engine/game.cpp

@@ -215,7 +215,6 @@ void Game::startHand()
 
 	// log new hand
 	myGui->logNewGameHandMsg(myGameID, currentHandID);
-	myGui->flushLogAtGame(myGameID);
 
 	currentHand->start();
 }

src/engine/local_engine/localhand.cpp

@@ -144,7 +144,6 @@ void LocalHand::start()
 	} else {
 		LOG_ERROR(__FILE__ << " (" << __LINE__ << "): Log Error: cannot find sBID or bBID");
 	}
-	myGui->flushLogAtHand();
 
 	// deal cards
 	myGui->dealHoleCards();

src/engine/log.cpp

@@ -119,15 +119,13 @@ Log::Log(ConfigFile *c) : mySqliteLogDb(0), mySqliteLogFileName(""), myConfig(c)
 
 Log::~Log()
 {
-	if(SQLITE_LOG) sqlite3_close(mySqliteLogDb);
+	sqlite3_close(mySqliteLogDb);
 }
 
 void
 Log::init()
 {
 
-	if(SQLITE_LOG) {
-
 	// logging activated
 	if(myConfig->readConfigInt("LogOnOff")) {
 
@@ -231,15 +229,12 @@ Log::init()
 		}
 	}
 }
-}
 
 void
 Log::logNewGameMsg(int gameID, int startCash, int startSmallBlind, unsigned dealerPosition, PlayerList seatsList)
 {
 	uniqueGameID++;
 
-	if(SQLITE_LOG) {
-
 	if(myConfig->readConfigInt("LogOnOff")) {
 		//if write logfiles is enabled
 
@@ -283,7 +278,6 @@ Log::logNewGameMsg(int gameID, int startCash, int startSmallBlind, unsigned deal
 		}
 	}
 }
-}
 
 void
 Log::logNewHandMsg(int handID, unsigned dealerPosition, int smallBlind, unsigned smallBlindPosition, int bigBlind, unsigned bigBlindPosition, PlayerList seatsList)
@@ -296,8 +290,6 @@ Log::logNewHandMsg(int handID, unsigned dealerPosition, int smallBlind, unsigned
 		(*it_c)->setLogHoleCardsDone(false);
 	}
 
-	if(SQLITE_LOG) {
-
 	if(myConfig->readConfigInt("LogOnOff")) {
 		//if write logfiles is enabled
 
@@ -374,14 +366,11 @@ Log::logNewHandMsg(int handID, unsigned dealerPosition, int smallBlind, unsigned
 		}
 	}
 }
-}
 
 void
 Log::logPlayerAction(string playerName, PlayerActionLog action, int amount)
 {
 
-	if(SQLITE_LOG) {
-
 	if(myConfig->readConfigInt("LogOnOff")) {
 		//if write logfiles is enabled
 
@@ -411,14 +400,11 @@ Log::logPlayerAction(string playerName, PlayerActionLog action, int amount)
 		}
 	}
 }
-}
 
 void
 Log::logPlayerAction(int seat, PlayerActionLog action, int amount)
 {
 
-	if(SQLITE_LOG) {
-
 	if(myConfig->readConfigInt("LogOnOff")) {
 		//if write logfiles is enabled
 
@@ -522,7 +508,6 @@ Log::logPlayerAction(int seat, PlayerActionLog action, int amount)
 		}
 	}
 }
-}
 
 PlayerActionLog
 Log::transformPlayerActionLog(PlayerAction action)
@@ -552,7 +537,6 @@ Log::transformPlayerActionLog(PlayerAction action)
 void
 Log::logBoardCards(int boardCards[5])
 {
-	if(SQLITE_LOG) {
 
 	if(myConfig->readConfigInt("LogOnOff")) {
 		//if write logfiles is enabled
@@ -591,7 +575,6 @@ Log::logBoardCards(int boardCards[5])
 		}
 	}
 }
-}
 
 void
 Log::logHoleCardsHandName(PlayerList activePlayerList)
@@ -612,8 +595,6 @@ void
 Log::logHoleCardsHandName(PlayerList activePlayerList, boost::shared_ptr<PlayerInterface> player, bool forceExecLog)
 {
 
-	if(SQLITE_LOG) {
-
 	if(myConfig->readConfigInt("LogOnOff")) {
 		//if write logfiles is enabled
 
@@ -652,7 +633,6 @@ Log::logHoleCardsHandName(PlayerList activePlayerList, boost::shared_ptr<PlayerI
 		}
 	}
 }
-}
 
 void
 Log::logHandWinner(PlayerList activePlayerList, int highestCardsValue, std::list<unsigned> winners)
@@ -752,12 +732,10 @@ Log::exec_transaction()
 //void
 //Log::closeLogDbAtExit()
 //{
-//    if(SQLITE_LOG) {
 //    // close sqlite-db
 //    sqlite3_close(mySqliteLogDb);
 //    mySqliteLogDb = NULL;
 //}
-//}
 
 void
 Log::debugMode_getStartSmallBlind(int* startSmallBlind, int* currentSmallBlind)

src/game_defs.h

@@ -37,9 +37,6 @@
 #define MIN_GUI_SPEED			1
 #define MAX_GUI_SPEED			11
 
-#define SQLITE_LOG			1
-#define HTML_LOG			0
-
 #define POKERTH_VERSION_MAJOR	1
 #define POKERTH_VERSION_MINOR	11
 #define POKERTH_VERSION			((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR)

src/gui/generic/serverguiwrapper.cpp

@@ -105,8 +105,6 @@ void ServerGuiWrapper::logNewBlindsSetsMsg(int /*sbSet*/, int /*bbSet*/, std::st
 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::logPlayerWinGame(std::string /*playerName*/, int /*gameID*/) {}
-void ServerGuiWrapper::flushLogAtGame(int /*gameID*/) {}
-void ServerGuiWrapper::flushLogAtHand() {}
 
 void ServerGuiWrapper::SignalNetClientServerListAdd(unsigned serverId)
 {

src/gui/generic/serverguiwrapper.h

@@ -118,8 +118,6 @@ public:
 	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 logPlayerWinGame(std::string playerName, int gameID);
-	void flushLogAtGame(int gameID);
-	void flushLogAtHand();
 
 	void SignalNetClientConnect(int actionID);
 	void SignalNetClientGameInfo(int actionID);

src/gui/guiinterface.h

@@ -119,8 +119,6 @@ public:
 	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;
 	virtual void logPlayerWinGame(std::string playerName, int gameID) =0;
-	virtual void flushLogAtGame(int gameID) =0;
-	virtual void flushLogAtHand() =0;
 
 
 };

src/gui/qt/gametable/log/guilog.cpp

@@ -61,9 +61,6 @@ guiLog::guiLog(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(
 	connect(this, SIGNAL(signalLogSpectatorLeftMsg(QString, int)), this, SLOT(logSpectatorLeftMsg(QString, int)));
 	connect(this, SIGNAL(signalLogSpectatorJoinedMsg(QString)), this, SLOT(logSpectatorJoinedMsg(QString)));
 	connect(this, SIGNAL(signalLogPlayerWinGame(QString, int)), this, SLOT(logPlayerWinGame(QString, int)));
-	connect(this, SIGNAL(signalFlushLogAtGame(int)), this, SLOT(flushLogAtGame(int)));
-	connect(this, SIGNAL(signalFlushLogAtHand()), this, SLOT(flushLogAtHand()));
-
 
 	logFileStreamString = "";
 	lastGameID = 0;
@@ -79,40 +76,7 @@ guiLog::guiLog(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(
 
 			myLogDir = new QDir(QString::fromUtf8(myConfig->readConfigString("LogDir").c_str()));
 
-			if(HTML_LOG) {
+			// delete old log files - TODO: move to Log
-
-				QDateTime currentTime = QDateTime::currentDateTime();
-				if(SQLITE_LOG) {
-					myHtmlLogFile_old = new QFile(myLogDir->absolutePath()+"/pokerth-log-"+currentTime.toString("yyyy-MM-dd_hh.mm.ss")+"_old.html");
-				} else {
-					myHtmlLogFile_old = new QFile(myLogDir->absolutePath()+"/pokerth-log-"+currentTime.toString("yyyy-MM-dd_hh.mm.ss")+".html");
-				}
-
-				//Logo-Pixmap extrahieren
-				QPixmap logoChipPixmapFile(":/gfx/logoChip3D.png");
-				logoChipPixmapFile.save(myLogDir->absolutePath()+"/logo.png");
-
-//                myW->textBrowser_Log->append(myHtmlLogFile_old->fileName());
-
-				// erstelle html-Datei
-				myHtmlLogFile_old->open( QIODevice::WriteOnly );
-				QTextStream stream_old( myHtmlLogFile_old );
-				stream_old << "<html>\n";
-				stream_old << "<head>\n";
-				stream_old << "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf8\">";
-				stream_old << "</head>\n";
-#ifdef GUI_800x480
-				stream_old << "<body style=\"font-size:14px\">\n";
-#else
-				stream_old << "<body>\n";
-#endif
-				stream_old << "<img src='logo.png'>\n";
-				stream_old << QString("<h3><b>Log-File for PokerTH %1 Session started on ").arg(POKERTH_BETA_RELEASE_STRING)+QDate::currentDate().toString("yyyy-MM-dd")+" at "+QTime::currentTime().toString("hh:mm:ss")+"</b></h3>\n";
-				myHtmlLogFile_old->close();
-
-			}
-
-			// delete old log files
 			int daysUntilWaste = myConfig->readConfigInt("LogStoreDuration");
 
 			QStringList filters("pokerth-log*");
@@ -191,62 +155,19 @@ void guiLog::logPlayerActionMsg(QString msg, int action, int setValue)
 	myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+msg+"</span>");
 #endif
 
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-			//if write logfiles is enabled
-
-			logFileStreamString += msg+"</br>\n";
-
-			if(myConfig->readConfigInt("LogInterval") == 0) {
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-			}
-
-		}
-
-	}
 }
 
 void guiLog::logNewGameHandMsg(int gameID, int handID)
 {
-
-	PlayerListConstIterator it_c;
-	boost::shared_ptr<HandInterface> currentHand = myW->getSession()->getCurrentGame()->getCurrentHand();
-
-	PlayerList activePlayerList = currentHand->getActivePlayerList();
-
 #ifdef GUI_800x480
 	myW->tabs.textBrowser_Log->append("<span style=\"color:#"+myStyle->getChatLogTextColor()+"; font-size:large; font-weight:bold\">## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##</span>");
 #else
 	myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getChatLogTextColor()+"; font-size:large; font-weight:bold\">## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##</span>");
 #endif
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-			//if write logfiles is enabled
-
-			logFileStreamString += "<table><tr><td width=\"600\" align=\"center\"><hr noshade size=\"3\"><b>Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+"</b></td><td></td></tr></table>";
-			logFileStreamString += "BLIND LEVEL: $"+QString::number(currentHand->getSmallBlind())+" / $"+QString::number(currentHand->getSmallBlind()*2)+"</br>";
-
-			//print cash only for active players
-			for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
-
-				logFileStreamString += "Seat " + QString::number((*it_c)->getMyID()+1,10) + ": <b>" +  QString::fromUtf8((*it_c)->getMyName().c_str()) + "</b> ($" + QString::number((*it_c)->getMyCash()+(*it_c)->getMySet(),10)+")</br>";
-
-			}
-
-		}
-
-	}
-
 }
 
 void guiLog::logNewBlindsSetsMsg(int sbSet, int bbSet, QString sbName, QString bbName)
 {
-
 	// log blinds
 #ifdef GUI_800x480
 	myW->tabs.textBrowser_Log->append("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+sbName+" posts small blind ($"+QString::number(sbSet,10)+")</span>");
@@ -255,45 +176,6 @@ void guiLog::logNewBlindsSetsMsg(int sbSet, int bbSet, QString sbName, QString b
 	myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+sbName+" posts small blind ($"+QString::number(sbSet,10)+")</span>");
 	myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+bbName+" posts big blind ($"+QString::number(bbSet,10)+")</span>");
 #endif
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-			//if write logfiles is enabled
-
-			logFileStreamString += "BLINDS: ";
-
-			logFileStreamString += sbName+" ($"+QString::number(sbSet,10)+"), ";
-			logFileStreamString += bbName+" ($"+QString::number(bbSet,10)+")";
-
-			PlayerListConstIterator it_c;
-			boost::shared_ptr<Game> currentGame = myW->getSession()->getCurrentGame();
-			PlayerList activePlayerList = currentGame->getActivePlayerList();
-
-			for(it_c=activePlayerList->begin(); it_c!=activePlayerList->end(); ++it_c) {
-
-				if(activePlayerList->size() > 2) {
-					if((*it_c)->getMyButton() == BUTTON_DEALER) {
-
-						logFileStreamString += "</br>" + QString::fromUtf8((*it_c)->getMyName().c_str()) + " starts as dealer.";
-						break;
-					}
-				} else {
-					if((*it_c)->getMyButton() == BUTTON_SMALL_BLIND) {
-
-						logFileStreamString += "</br>" + QString::fromUtf8((*it_c)->getMyName().c_str()) + " starts as dealer.";
-						break;
-					}
-				}
-			}
-
-			logFileStreamString += "</br></br><b>PREFLOP</b>";
-			logFileStreamString += "</br>\n";
-
-		}
-
-	}
-
 }
 
 void guiLog::logPlayerWinsMsg(QString playerName, int pot, bool main)
@@ -312,116 +194,43 @@ void guiLog::logPlayerWinsMsg(QString playerName, int pot, bool main)
 		myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogWinnerSidePotColor()+";\">"+playerName+" wins $"+QString::number(pot,10)+" (side pot)</span>");
 	}
 #endif
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-			//if write logfiles is enabled
-
-			logFileStreamString += "</br><i>"+playerName+" wins $"+QString::number(pot,10);
-			if(!main) {
-				logFileStreamString += " (side pot)";
-			}
-			logFileStreamString += "</i>\n";
-
-			if(myConfig->readConfigInt("LogInterval") == 0) {
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-			}
-		}
-
-	}
 }
 
 void guiLog::logPlayerSitsOut(QString playerName)
 {
-
 #ifdef GUI_800x480
 	myW->tabs.textBrowser_Log->append("<i><span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">"+playerName+" sits out</span></i>");
 #else
 	myW->textBrowser_Log->append("<i><span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">"+playerName+" sits out</span></i>");
 #endif
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-
-			logFileStreamString += "</br><i><span style=\"font-size:smaller;\">"+playerName+" sits out</span></i>\n";
-
-			if(myConfig->readConfigInt("LogInterval") == 0) {
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-			}
-		}
-
-	}
 }
 
 void guiLog::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4, int card5)
 {
-
-	QString round;
-
 	switch (roundID) {
-
 	case 1:
-		round = "Flop";
 #ifdef GUI_800x480
-		myW->tabs.textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+"]</span>");
+		myW->tabs.textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- Flop --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+"]</span>");
 #else
-		myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+"]</span>");
+		myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- Flop --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+"]</span>");
 #endif
 		break;
 	case 2:
-		round = "Turn";
 #ifdef GUI_800x480
-		myW->tabs.textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+"]</span>");
+		myW->tabs.textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- Turn --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+"]</span>");
 #else
-		myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+"]</span>");
+		myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- Turn --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+"]</span>");
 #endif
 		break;
 	case 3:
-		round = "River";
 #ifdef GUI_800x480
-		myW->tabs.textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+translateCardCode(card5).at(1)+"]</span>");
+		myW->tabs.textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- River --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+translateCardCode(card5).at(1)+"]</span>");
 #else
-		myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- "+round+" --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+translateCardCode(card5).at(1)+"]</span>");
+		myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getLogPlayerSitsOutColor()+";\">--- River --- "+"["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+","+translateCardCode(card3).at(0)+translateCardCode(card3).at(1)+","+translateCardCode(card4).at(0)+translateCardCode(card4).at(1)+","+translateCardCode(card5).at(0)+translateCardCode(card5).at(1)+"]</span>");
 #endif
 		break;
 	default:
-		round = "ERROR";
-	}
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-			//if write logfiles is enabled
-
-			switch (roundID) {
-
-			case 1:
-				round = "Flop";
-				logFileStreamString += "</br><b>"+round.toUpper()+"</b> [board cards <b>"+translateCardCode(card1).at(0)+"</b>"+translateCardCode(card1).at(1)+",<b>"+translateCardCode(card2).at(0)+"</b>"+translateCardCode(card2).at(1)+",<b>"+translateCardCode(card3).at(0)+"</b>"+translateCardCode(card3).at(1)+"]"+"</br>\n";
 		break;
-			case 2:
-				round = "Turn";
-				logFileStreamString += "</br><b>"+round.toUpper()+"</b> [board cards <b>"+translateCardCode(card1).at(0)+"</b>"+translateCardCode(card1).at(1)+",<b>"+translateCardCode(card2).at(0)+"</b>"+translateCardCode(card2).at(1)+",<b>"+translateCardCode(card3).at(0)+"</b>"+translateCardCode(card3).at(1)+",<b>"+translateCardCode(card4).at(0)+"</b>"+translateCardCode(card4).at(1)+"]"+"</br>\n";
-				break;
-			case 3:
-				round = "River";
-				logFileStreamString += "</br><b>"+round.toUpper()+"</b> [board cards <b>"+translateCardCode(card1).at(0)+"</b>"+translateCardCode(card1).at(1)+",<b>"+translateCardCode(card2).at(0)+"</b>"+translateCardCode(card2).at(1)+",<b>"+translateCardCode(card3).at(0)+"</b>"+translateCardCode(card3).at(1)+",<b>"+translateCardCode(card4).at(0)+"</b>"+translateCardCode(card4).at(1)+",<b>"+translateCardCode(card5).at(0)+"</b>"+translateCardCode(card5).at(1)+"]"+"</br>\n";
-				break;
-			default:
-				round = "ERROR";
-			}
-
-			if(myConfig->readConfigInt("LogInterval") == 0) {
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-			}
-
-		}
-
 	}
 }
 
@@ -447,40 +256,10 @@ void guiLog::logFlipHoleCardsMsg(QString playerName, int card1, int card2, int c
 		myW->textBrowser_Log->append("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+playerName+" "+showHas+" ["+translateCardCode(card1).at(0)+translateCardCode(card1).at(1)+","+translateCardCode(card2).at(0)+translateCardCode(card2).at(1)+"]</span>");
 #endif
 	}
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-			//if write logfiles is enabled
-
-			if (cardsValueInt != -1) {
-
-				tempHandName.fromStdString(CardsValue::determineHandName(cardsValueInt,myW->getSession()->getCurrentGame()->getActivePlayerList()));
-
-				logFileStreamString += playerName+" "+showHas+" [ <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);
-					logFileStreamString = "";
-				}
-
-			} else {
-
-				logFileStreamString += playerName+" "+showHas+" [<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 = "";
-				}
-			}
-		}
-
-	}
-
 }
 
 void guiLog::logPlayerLeftMsg(QString playerName, int wasKicked)
 {
-
 	QString action;
 	if(wasKicked) action = "was kicked from";
 	else action = "has left";
@@ -490,44 +269,15 @@ void guiLog::logPlayerLeftMsg(QString playerName, int wasKicked)
 #else
 	myW->textBrowser_Log->append( "<span style=\"color:#"+myStyle->getChatLogTextColor()+";\"><i>"+playerName+" "+action+" the game!</i></span>");
 #endif
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-
-			logFileStreamString += "<i>"+playerName+" "+action+" the game!</i><br>\n";
-
-			if(myConfig->readConfigInt("LogInterval") == 0) {
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-			}
-		}
-
-	}
 }
 
 void guiLog::logNewGameAdminMsg(QString playerName)
 {
-
 #ifdef GUI_800x480
 	myW->tabs.textBrowser_Log->append( "<i><span style=\"color:#"+myStyle->getLogNewGameAdminColor()+";\">"+playerName+" is game admin now!</span></i>");
 #else
 	myW->textBrowser_Log->append( "<i><span style=\"color:#"+myStyle->getLogNewGameAdminColor()+";\">"+playerName+" is game admin now!</span></i>");
 #endif
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-
-			logFileStreamString += "<i>"+playerName+" is game admin now!</i><br>\n";
-
-			if(myConfig->readConfigInt("LogInterval") == 0) {
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-			}
-		}
-
-	}
 }
 
 void guiLog::logPlayerJoinedMsg(QString playerName)
@@ -551,27 +301,11 @@ void guiLog::logSpectatorJoinedMsg(QString playerName)
 
 void guiLog::logPlayerWinGame(QString playerName, int gameID)
 {
-
 #ifdef GUI_800x480
 	myW->tabs.textBrowser_Log->append( "<i><b>"+playerName+" wins game " + QString::number(gameID,10)  +"!</i></b><br>");
 #else
 	myW->textBrowser_Log->append( "<i><b>"+playerName+" wins game " + QString::number(gameID,10)  +"!</i></b><br>");
 #endif
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-
-			logFileStreamString += "</br></br><i><b>"+playerName+" wins game " + QString::number(gameID,10)  +"!</i></b></br>\n";
-
-			if(myConfig->readConfigInt("LogInterval") == 0) {
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-			}
-		}
-
-	}
-
 }
 
 QStringList guiLog::translateCardCode(int cardCode)
@@ -693,39 +427,6 @@ void guiLog::writeLog(string log_string, int modus)
 
 }
 
-void guiLog::flushLogAtHand()
-{
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-			if(myConfig->readConfigInt("LogInterval") < 2) {
-				// 	write for log after every action and after every hand
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-			}
-		}
-
-	}
-}
-
-void guiLog::flushLogAtGame(int gameID)
-{
-
-	if(HTML_LOG) {
-
-		if(myConfig->readConfigInt("LogOnOff")) {
-			//	write for log after every game
-			if(gameID > lastGameID) {
-				writeLogFileStream(logFileStreamString);
-				logFileStreamString = "";
-				lastGameID = gameID;
-			}
-		}
-
-	}
-}
-
 void guiLog::exportLogPdbToHtml(QString fileStringPdb, QString exportFileString)
 {
 

src/gui/qt/gametable/log/guilog.h

@@ -81,8 +81,6 @@ public slots:
 	void logSpectatorLeftMsg(QString playerName, int wasKicked);
 	void logSpectatorJoinedMsg(QString playerName);
 	void logPlayerWinGame(QString playerName, int gameID);
-	void flushLogAtGame(int gameID);
-	void flushLogAtHand();
 	void exportLogPdbToHtml(QString fileStringPdb, QString exportFileString);
 	void exportLogPdbToTxt(QString fileStringPdb, QString exportFileString);
 	void showLog(QString fileStringPdb, QTextBrowser *tb, int uniqueGameID = 0);
@@ -115,8 +113,6 @@ signals:
 	void signalLogSpectatorJoinedMsg(QString playerName);
 	void signalLogNewGameAdminMsg(QString playerName);
 	void signalLogPlayerWinGame(QString playerName, int gameID);
-	void signalFlushLogAtGame(int gameID);
-	void signalFlushLogAtHand();
 
 
 private:

src/gui/qt/guiwrapper.cpp

@@ -287,14 +287,6 @@ void GuiWrapper::logPlayerWinGame(std::string playerName, int gameID)
 {
 	myGuiLog->signalLogPlayerWinGame(QString::fromUtf8(playerName.c_str()), gameID);
 }
-void GuiWrapper::flushLogAtGame(int gameID)
-{
-	myGuiLog->signalFlushLogAtGame(gameID);
-}
-void GuiWrapper::flushLogAtHand()
-{
-	myGuiLog->signalFlushLogAtHand();
-}
 
 
 void GuiWrapper::SignalNetClientConnect(int actionID)

src/gui/qt/guiwrapper.h

@@ -124,8 +124,6 @@ public:
 	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 logPlayerWinGame(std::string playerName, int gameID);
-	void flushLogAtGame(int gameID);
-	void flushLogAtHand();
 
 	void SignalNetClientConnect(int actionID);
 	void SignalNetClientServerListAdd(unsigned serverId);

src/net/common/clientstate.cpp

@@ -1800,7 +1800,6 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
 				curGame->getPlayerByUniqueId(curGame->getCurrentHand()->getCurrentBeRo()->getBigBlindPositionId())->getMySet(),
 				curGame->getPlayerByUniqueId(curGame->getCurrentHand()->getCurrentBeRo()->getSmallBlindPositionId())->getMyName(),
 				curGame->getPlayerByUniqueId(curGame->getCurrentHand()->getCurrentBeRo()->getBigBlindPositionId())->getMyName());
-			client->GetGui().flushLogAtHand();
 			client->GetClientLog()->logNewHandMsg(
 				curGame->getCurrentHandID(),
 				curGame->getPlayerByUniqueId(curGame->getCurrentHand()->getDealerPosition())->getMyID()+1,