fixes 20/40 bug

pokerth.pro

@@ -3,6 +3,31 @@
 INSTALLS += TARGET 
 TARGET.files += bin/* 
 TARGET.path = /usr/bin/ 
+
+INCLUDEPATH += . \
+		src \
+		src/engine \
+		src/gui \
+		src/net \
+		src/engine/local_engine \
+		src/config \
+		src/core/tinyxml \
+		src/gui/qt \
+		src/gui/qt/log \
+		src/gui/qt/connecttoserverdialog \
+		src/core \
+		src/gui/qt/qttools \
+		src/gui/qt/qttools/qthelper \
+		src/gui/qt/mainwindow \
+		src/gui/qt/mainwindow/startsplash \
+		src/gui/qt/aboutpokerth \
+		src/gui/qt/createnetworkgamedialog \
+		src/gui/qt/joinnetworkgamedialog \
+		src/gui/qt/newlocalgamedialog \
+		src/gui/qt/settingsdialog \
+		src/gui/qt/startnetworkgamedialog \
+		src/gui/qt/waitforservertostartgamedialog
+
 DEPENDPATH += . \
               src \
               src/config \
@@ -28,29 +53,6 @@ DEPENDPATH += . \
               src/gui/qt/settingsdialog \
               src/gui/qt/startnetworkgamedialog \
               src/gui/qt/waitforservertostartgamedialog
-INCLUDEPATH += . \
-               src \
-               src/engine \
-               src/gui \
-               src/net \
-               src/engine/local_engine \
-               src/config \
-               src/core/tinyxml \
-               src/gui/qt \
-               src/gui/qt/log \
-               src/gui/qt/connecttoserverdialog \
-               src/core \
-	       src/gui/qt/qttools \		
-	       src/gui/qt/qttools/qthelper \
-	       src/gui/qt/mainwindow \
-	       src/gui/qt/mainwindow/startsplash \
-               src/gui/qt/aboutpokerth \
-               src/gui/qt/createnetworkgamedialog \
-               src/gui/qt/joinnetworkgamedialog \
-               src/gui/qt/newlocalgamedialog \
-               src/gui/qt/settingsdialog \
-               src/gui/qt/startnetworkgamedialog \
-               src/gui/qt/waitforservertostartgamedialog
 # Input
 HEADERS += src/game.h \
            src/session.h \
@@ -193,8 +195,10 @@ TRANSLATIONS = ts/pokerth_de.ts \
     	       ts/pokerth_pt.ts \
        	       ts/pokerth_nl.ts
 CODECFORSRC = UTF-8
+
 TEMPLATE = vcapp
 TEMPLATE = app
+
 win32{
     DEPENDPATH += src/net/win32/ src/core/win32
     SOURCES += src/core/win32/rand.cpp \
@@ -242,8 +246,12 @@ macx {
 }
 
 CONFIG += qt release
+#CONFIG += qt warn_on debug
 UI_DIR = uics
 TARGET = bin/pokerth
 MOC_DIR = mocs
 OBJECTS_DIR = obj
 QT += 
+# QMAKE_CXXFLAGS_DEBUG += -g
+
+

src/game.cpp

@@ -108,6 +108,7 @@ Game::~Game()
 
 void Game::startHand()
 {
+
 	int i;
 
 	// eventuell vorhandene Hand löschen
@@ -119,7 +120,7 @@ void Game::startHand()
 	actualHandID++;
 
 	// smallBlind alle x Runden erhöhen
-	if(actualHandID%(startHandsBeforeRaiseSmallBlind+1) == 0) actualSmallBlind *= 2;
+	if(actualHandID%(startHandsBeforeRaiseSmallBlind+1) == 0) { actualSmallBlind *= 2; }
 
 	//Spieler Action auf 0 setzen 
 	for(i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
@@ -140,7 +141,6 @@ void Game::startHand()
 	// Hand erstellen
 	actualHand = myFactory->createHand(myFactory, myGui, actualBoard, playerArray, actualHandID, startQuantityPlayers, actualQuantityPlayers, dealerPosition, actualSmallBlind, startCash);
 
-	
 	//GUI bereinigen 
 	myGui->nextRoundCleanGui();
 

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -2060,13 +2060,27 @@ void mainWindowImpl::nextRoundCleanGui() {
 	flipHolecardsAllInAlreadyDone = FALSE;
 
 	//Wenn Pause zwischen den Hands in der Konfiguration steht den Stop Button drücken!
-	if (myConfig->readConfigInt("PauseBetweenHands")) { pushButton_break->click(); }
+	if (myConfig->readConfigInt("PauseBetweenHands") && blinkingStartButtonAnimationTimer->isActive() == FALSE ) { 
+		pushButton_break->click(); 
+	}
 	else { 
 		//FIX STRG+N Bug
 		pushButton_break->setEnabled(TRUE); 
 		breakAfterActualHand=FALSE;
 	}
 	
+	//Clean breakbutton
+	blinkingStartButtonAnimationTimer->stop();
+	QPalette tempPalette = pushButton_break->palette();
+	tempPalette.setColor(QPalette::Button, QColor(40,82,0));
+	tempPalette.setColor(QPalette::ButtonText, QColor(240,240,240));
+	pushButton_break->setPalette(tempPalette);
+	blinkingStartButtonAnimationTimer->stop();
+	QFontMetrics tempMetrics = this->fontMetrics();
+	int width = tempMetrics.width(tr("Stop"));
+	pushButton_break->setMinimumSize(width+10,20);
+       	pushButton_break->setText(tr("Stop"));
+	
 	//Clear Statusbarmessage
 	statusBar()->clearMessage();
 }