diff --git a/pokerth_game.pro b/pokerth_game.pro
index b90c18cf..e8a5628b 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -406,7 +406,8 @@ unix:!mac {
-lpokerth_protocol
LIBS += $$BOOST_LIBS
LIBS += -lSDL_mixer \
- -lcurl
+ -lcurl \
+ -lgsasl
!isEmpty( BSD ) && isEmpty( kFreeBSD ):LIBS += -lcrypto
else:LIBS += -lgnutls-openssl \
-lgcrypt
diff --git a/pokerth_server.pro b/pokerth_server.pro
index f7aae64e..85ca17d5 100644
--- a/pokerth_server.pro
+++ b/pokerth_server.pro
@@ -241,7 +241,7 @@ unix : !mac {
-lpokerth_db \
-lpokerth_protocol
LIBS += $$BOOST_LIBS
- LIBS += -lcurl
+ LIBS += -lcurl -lgsasl
!isEmpty( BSD ) && isEmpty( kFreeBSD ){
LIBS += -lcrypto -liconv
} else {
diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 3f63152b..ff4d246e 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
myQtToolsInterface = CreateQtToolsWrapper();
// !!!! Revisionsnummer der Configdefaults !!!!!
- configRev = 77;
+ configRev = 78;
//standard defaults
logOnOffDefault = "1";
@@ -189,6 +189,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
configList.push_back(ConfigInfo("NetAfterMBAlwaysRaiseValue", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("NetAfterMBStayAtLastBlind", CONFIG_TYPE_INT, "0"));
configList.push_back(ConfigInfo("NetGameSpeed", CONFIG_TYPE_INT, "4"));
+ configList.push_back(ConfigInfo("NetDelayBetweenHands", CONFIG_TYPE_INT, "7"));
configList.push_back(ConfigInfo("NetTimeOutPlayerAction", CONFIG_TYPE_INT, "20"));
configList.push_back(ConfigInfo("ServerPassword", CONFIG_TYPE_STRING, ""));
configList.push_back(ConfigInfo("ServerUseIpv6", CONFIG_TYPE_INT, "0"));
diff --git a/src/gui/qt/createinternetgamedialog.ui b/src/gui/qt/createinternetgamedialog.ui
index c9a777e9..292f9733 100644
--- a/src/gui/qt/createinternetgamedialog.ui
+++ b/src/gui/qt/createinternetgamedialog.ui
@@ -110,56 +110,7 @@
- -
-
-
- Game Speed for computer opponents:
-
-
- spinBox_gameSpeed
-
-
-
- -
-
-
- 1
-
-
- 11
-
-
- 4
-
-
-
- -
-
-
- Timeout for player action:
-
-
- spinBox_netTimeOutPlayerAction
-
-
-
- -
-
-
- s
-
-
- 5
-
-
- 60
-
-
- 20
-
-
-
- -
+
-
6
@@ -186,6 +137,58 @@
+ -
+
+
+ Timeout for player action:
+
+
+ spinBox_netTimeOutPlayerAction
+
+
+
+ -
+
+
+ Delay between hands:
+
+
+ spinBox_netDelayBetweenHands
+
+
+
+ -
+
+
+ s
+
+
+ 5
+
+
+ 60
+
+
+ 20
+
+
+
+ -
+
+
+ s
+
+
+ 5
+
+
+ 20
+
+
+ 7
+
+
+
@@ -233,8 +236,6 @@
spinBox_startCash
radioButton_useSavedBlindsSettings
radioButton_changeBlindsSettings
- spinBox_gameSpeed
- spinBox_netTimeOutPlayerAction
checkBox_Password
lineEdit_Password
pushButton_createGame
diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
index 8cb98129..6c32c1cd 100644
--- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
+++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
@@ -67,8 +67,7 @@ void createInternetGameDialogImpl::fillFormular() {
//Network Game Settings
spinBox_quantityPlayers->setValue(myConfig->readConfigInt("NetNumberOfPlayers"));
spinBox_startCash->setValue(myConfig->readConfigInt("NetStartCash"));
- //temporarely unused until ai is enabled in network
- spinBox_gameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed"));
+ spinBox_netDelayBetweenHands->setValue(myConfig->readConfigInt("NetDelayBetweenHands"));
spinBox_netTimeOutPlayerAction->setValue(myConfig->readConfigInt("NetTimeOutPlayerAction"));
checkBox_Password->setChecked(myConfig->readConfigInt("UseInternetGamePassword"));
if(myConfig->readConfigInt("UseInternetGamePassword")) {
diff --git a/src/gui/qt/createnetworkgamedialog.ui b/src/gui/qt/createnetworkgamedialog.ui
index b67237c2..025b4611 100644
--- a/src/gui/qt/createnetworkgamedialog.ui
+++ b/src/gui/qt/createnetworkgamedialog.ui
@@ -104,30 +104,7 @@
- -
-
-
- Game Speed for computer opponents:
-
-
- spinBox_gameSpeed
-
-
-
- -
-
-
- 1
-
-
- 11
-
-
- 4
-
-
-
- -
+
-
Timeout for player action:
@@ -137,7 +114,17 @@
- -
+
-
+
+
+ Delay between hands:
+
+
+ spinBox_netDelayBetweenHands
+
+
+
+ -
s
@@ -153,6 +140,22 @@
+ -
+
+
+ s
+
+
+ 5
+
+
+ 20
+
+
+ 7
+
+
+
@@ -200,8 +203,6 @@
spinBox_startCash
radioButton_useSavedBlindsSettings
radioButton_changeBlindsSettings
- spinBox_gameSpeed
- spinBox_netTimeOutPlayerAction
pushButton_createGame
pushButton_cancel
diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
index b1b081fa..542cb8ee 100644
--- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
@@ -66,8 +66,7 @@ void createNetworkGameDialogImpl::fillFormular() {
//Network Game Settings
spinBox_quantityPlayers->setValue(myConfig->readConfigInt("NetNumberOfPlayers"));
spinBox_startCash->setValue(myConfig->readConfigInt("NetStartCash"));
- //temporarely unused until ai is enabled in network
- spinBox_gameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed"));
+ spinBox_netDelayBetweenHands->setValue(myConfig->readConfigInt("NetDelayBetweenHands"));
spinBox_netTimeOutPlayerAction->setValue(myConfig->readConfigInt("NetTimeOutPlayerAction"));
//fill changeCompleteBlindsDialog
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index 364d7af6..a97cb98c 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -176,7 +176,7 @@ void gameLobbyDialogImpl::createGame()
}
}
- gameData.guiSpeed = myCreateInternetGameDialog->spinBox_gameSpeed->value();
+ gameData.guiSpeed = myConfig->readConfigInt("GameSpeed");
gameData.playerActionTimeoutSec = myCreateInternetGameDialog->spinBox_netTimeOutPlayerAction->value();
QString gameString(tr("%1's game"));
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 8ee33606..e2231290 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -125,7 +125,7 @@
-
- 0
+ 4
@@ -1294,24 +1294,30 @@ p, li { white-space: pre-wrap; }
-
- Game Speed for computer opponents:
+ Delay between hands:
- spinBox_netGameSpeed
+ spinBox_netDelayBetweenHands
-
-
+
+
+ s
+
- 1
+ 5
- 11
+ 20
1
+
+ 7
+
@@ -3363,7 +3369,7 @@ p, li { white-space: pre-wrap; }
radioButton_netAlwaysDoubleBlinds
radioButton_netManualBlindsOrder
pushButton_netEditManualBlindsOrder
- spinBox_netGameSpeed
+ spinBox_netDelayBetweenHands
spinBox_netTimeOutPlayerAction
spinBox_serverPort
lineEdit_serverPassword
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 05cae0bb..7fbda5af 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -180,7 +180,7 @@ void settingsDialogImpl::exec() {
spinBox_netRaiseSmallBlindEveryMinutes->setValue(myConfig->readConfigInt("NetRaiseSmallBlindEveryMinutes"));
radioButton_netAlwaysDoubleBlinds->setChecked(myConfig->readConfigInt("NetAlwaysDoubleBlinds"));
radioButton_netManualBlindsOrder->setChecked(myConfig->readConfigInt("NetManualBlindsOrder"));
- spinBox_netGameSpeed->setValue(myConfig->readConfigInt("NetGameSpeed"));
+ spinBox_netDelayBetweenHands->setValue(myConfig->readConfigInt("NetDelayBetweenHands"));
spinBox_netTimeOutPlayerAction->setValue(myConfig->readConfigInt("NetTimeOutPlayerAction"));
spinBox_serverPort->setValue(myConfig->readConfigInt("ServerPort"));
lineEdit_serverPassword->setText(QString::fromUtf8(myConfig->readConfigString("ServerPassword").c_str()));
@@ -483,7 +483,7 @@ void settingsDialogImpl::isAccepted() {
myConfig->writeConfigInt("NetRaiseSmallBlindEveryMinutes", spinBox_netRaiseSmallBlindEveryMinutes->value());
myConfig->writeConfigInt("NetAlwaysDoubleBlinds", radioButton_netAlwaysDoubleBlinds->isChecked());
myConfig->writeConfigInt("NetManualBlindsOrder", radioButton_netManualBlindsOrder->isChecked());
- myConfig->writeConfigInt("NetGameSpeed", spinBox_netGameSpeed->value());
+ myConfig->writeConfigInt("NetDelayBetweenHands", spinBox_netDelayBetweenHands->value());
myConfig->writeConfigInt("NetTimeOutPlayerAction", spinBox_netTimeOutPlayerAction->value());
myConfig->writeConfigInt("ServerPort", spinBox_serverPort->value());
myConfig->writeConfigString("ServerPassword", lineEdit_serverPassword->text().toUtf8().constData());
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
index 5315aca1..e4cbb203 100644
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -390,7 +390,7 @@ void startWindowImpl::callCreateNetworkGameDialog() {
}
}
- gameData.guiSpeed = myCreateNetworkGameDialog->spinBox_gameSpeed->value();
+ gameData.guiSpeed = myConfig->readConfigInt("GameSpeed");
gameData.playerActionTimeoutSec = myCreateNetworkGameDialog->spinBox_netTimeOutPlayerAction->value();
myGameLobbyDialog->setSession(getSession());