first modifcations for new local game; enabling: uncomment define NEW_LOCAL_GAME in game_defs.h

2014-07-11 18:15:40 +02:00
parent cf60947efc
commit 304eac07a3
9 changed files with 233 additions and 12 deletions
@@ -256,6 +256,12 @@ startWindowImpl::startWindowImpl(ConfigFile *c, Log *l)
 	connect(this, SIGNAL(signalPlayerGameInvitation(unsigned, unsigned, unsigned)), myGameLobbyDialog, SLOT(chatInfoPlayerInvitation(unsigned, unsigned, unsigned)));
 	connect(this, SIGNAL(signalRejectedGameInvitation(unsigned, unsigned, DenyGameInvitationReason)), myGameLobbyDialog, SLOT(chatInfoPlayerRejectedInvitation(unsigned, unsigned, DenyGameInvitationReason)));

+#ifdef NEW_LOCAL_GAME
+	QAction *actionStart_Local_Game_new = new QAction("Start (new) local game ...",this);
+	menuPokerTH->addAction(actionStart_Local_Game_new);
+	connect( actionStart_Local_Game_new, SIGNAL( triggered() ), this, SLOT( callNewGameDialogNew() ) );
+#endif
+
 	this->show();

 	//update HACKS
@@ -289,6 +295,26 @@ void startWindowImpl::callNewGameDialog()
 	}
 }

+void startWindowImpl::callNewGameDialogNew()
+{
+
+	//wenn Dialogfenster gezeigt werden soll
+	if(myConfig->readConfigInt("ShowGameSettingsDialogOnNewGame")) {
+
+#ifdef ANDROID
+		myGuiInterface->getMyW()->hide();
+#endif
+		myNewGameDialog->exec();
+		if (myNewGameDialog->result() == QDialog::Accepted ) {
+			startNewLocalGameNew(myNewGameDialog);
+		}
+	}
+	// sonst mit gespeicherten Werten starten
+	else {
+		startNewLocalGameNew();
+	}
+}
+
 void startWindowImpl::startNewLocalGame(newGameDialogImpl *v)
 {

@@ -392,6 +418,117 @@ void startWindowImpl::startNewLocalGame(newGameDialogImpl *v)
 	mySession->startLocalGame(gameData, startData);
 }

+void startWindowImpl::startNewLocalGameNew(newGameDialogImpl *v)
+{
+
+	// Stop local game.
+	myGuiInterface->getMyW()->stopTimer();
+
+	if (!myServerGuiInterface) {
+		// Create pseudo Gui Wrapper for the server.
+		myServerGuiInterface.reset(new ServerGuiWrapper(myConfig, mySession->getGui(), mySession->getGui(), mySession->getGui()));
+		{
+			boost::shared_ptr<Session> session(new Session(myServerGuiInterface.get(), myConfig, 0));
+			session->init(mySession->getAvatarManager());
+			myServerGuiInterface->setSession(session);
+		}
+	}
+
+	// Terminate existing network games.
+	mySession->terminateNetworkClient();
+	myServerGuiInterface->getSession()->terminateNetworkServer();
+
+
+	GameData gameData;
+	if(v) {
+		gameData.maxNumberOfPlayers = v->spinBox_quantityPlayers->value();
+		gameData.startMoney = v->spinBox_startCash->value();
+		gameData.firstSmallBlind = v->getChangeCompleteBlindsDialog()->spinBox_firstSmallBlind->value();
+		if(v->getChangeCompleteBlindsDialog()->radioButton_raiseBlindsAtHands->isChecked()) {
+			gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER;
+			gameData.raiseSmallBlindEveryHandsValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryHands->value();
+		} else {
+			gameData.raiseIntervalMode = RAISE_ON_MINUTES;
+			gameData.raiseSmallBlindEveryMinutesValue = v->getChangeCompleteBlindsDialog()->spinBox_raiseSmallBlindEveryMinutes->value();
+		}
+
+		if(v->getChangeCompleteBlindsDialog()->radioButton_alwaysDoubleBlinds->isChecked()) {
+			gameData.raiseMode = DOUBLE_BLINDS;
+		} else {
+			gameData.raiseMode = MANUAL_BLINDS_ORDER;
+			list<int> tempBlindList;
+			int i;
+			bool ok = true;
+			for(i=0; i<v->getChangeCompleteBlindsDialog()->listWidget_blinds->count(); i++) {
+				tempBlindList.push_back(v->getChangeCompleteBlindsDialog()->listWidget_blinds->item(i)->text().toInt(&ok,10));
+			}
+			gameData.manualBlindsList = tempBlindList;
+
+			if(v->getChangeCompleteBlindsDialog()->radioButton_afterThisAlwaysDoubleBlinds->isChecked()) {
+				gameData.afterManualBlindsMode = AFTERMB_DOUBLE_BLINDS;
+			} else {
+				if(v->getChangeCompleteBlindsDialog()->radioButton_afterThisAlwaysRaiseAbout->isChecked()) {
+					gameData.afterManualBlindsMode = AFTERMB_RAISE_ABOUT;
+					gameData.afterMBAlwaysRaiseValue = v->getChangeCompleteBlindsDialog()->spinBox_afterThisAlwaysRaiseValue->value();
+				} else {
+					gameData.afterManualBlindsMode = AFTERMB_STAY_AT_LAST_BLIND;
+				}
+			}
+		}
+		gameData.guiSpeed = v->spinBox_gameSpeed->value();
+
+
+	} else {
+
+		gameData.maxNumberOfPlayers = myConfig->readConfigInt("NumberOfPlayers");
+		gameData.startMoney = myConfig->readConfigInt("StartCash");
+		gameData.firstSmallBlind =  myConfig->readConfigInt("FirstSmallBlind");
+
+		if(myConfig->readConfigInt("RaiseBlindsAtHands")) {
+			gameData.raiseIntervalMode = RAISE_ON_HANDNUMBER;
+			gameData.raiseSmallBlindEveryHandsValue = myConfig->readConfigInt("RaiseSmallBlindEveryHands");
+		} else {
+			gameData.raiseIntervalMode = RAISE_ON_MINUTES;
+			gameData.raiseSmallBlindEveryMinutesValue = myConfig->readConfigInt("RaiseSmallBlindEveryMinutes");
+		}
+
+		if(myConfig->readConfigInt("AlwaysDoubleBlinds")) {
+			gameData.raiseMode = DOUBLE_BLINDS;
+		} else {
+			gameData.raiseMode = MANUAL_BLINDS_ORDER;
+			gameData.manualBlindsList = myConfig->readConfigIntList("ManualBlindsList");
+
+			if(myConfig->readConfigInt("AfterMBAlwaysDoubleBlinds")) {
+				gameData.afterManualBlindsMode = AFTERMB_DOUBLE_BLINDS;
+			} else {
+				if(myConfig->readConfigInt("AfterMBAlwaysRaiseAbout")) {
+					gameData.afterManualBlindsMode = AFTERMB_RAISE_ABOUT;
+					gameData.afterMBAlwaysRaiseValue = myConfig->readConfigInt("AfterMBAlwaysRaiseValue");
+				} else {
+					gameData.afterManualBlindsMode = AFTERMB_STAY_AT_LAST_BLIND;
+				}
+			}
+		}
+		gameData.guiSpeed = myConfig->readConfigInt("GameSpeed");
+
+	}
+	gameData.delayBetweenHandsSec = 7;
+	gameData.playerActionTimeoutSec = 20;
+
+	myGameLobbyDialog->setSession(getSession());
+	myStartNetworkGameDialog->setSession(getSession());
+
+	myServerGuiInterface->getSession()->startNetworkServer(false,true);
+	mySession->startNetworkClientForLocalServer(gameData);
+
+	myGuiInterface->getMyW()->show();
+	myGuiInterface->getMyW()->networkGameModification();
+
+	assert(getSession());
+	getSession()->sendStartEvent(true);
+
+}
+
 void startWindowImpl::callGameLobbyDialog()
 {

@@ -149,6 +149,7 @@ public slots:
 	void callSettingsDialog(bool);
 	void callSettingsDialogFromStartwindow();
 	void callNewGameDialog();
+	void callNewGameDialogNew();
 	void callGameLobbyDialog();
 	void callCreateNetworkGameDialog();
 	void callJoinNetworkGameDialog();
@@ -161,6 +162,7 @@ public slots:
 	void callLogFileDialog();

 	void startNewLocalGame(newGameDialogImpl* =0);
+    void startNewLocalGameNew(newGameDialogImpl* =0);

 	void showTimeoutDialog(int msgID, unsigned duration);
 	void hideTimeoutDialog();