Start position of dealer is now set via network. Added files for network client engine. Added factory code.

src/gui/qt/guiwrapper.cpp

@@ -95,7 +95,7 @@ void GuiWrapper::SignalNetClientGameInfo(int actionID) { myW->SignalNetClientGam
 void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myW->SignalNetClientError(errorID, osErrorID); }
 void GuiWrapper::SignalNetClientPlayerJoined(const string &playerName) { myW->SignalNetClientPlayerJoined(QString::fromUtf8(playerName.c_str())); }
 void GuiWrapper::SignalNetClientPlayerLeft(const string &playerName) { myW->SignalNetClientPlayerLeft(QString::fromUtf8(playerName.c_str())); }
-void GuiWrapper::SignalNetClientGameStart(const GameData &gameData) { myW->SignalNetClientGameStart(gameData.numberOfPlayers, gameData.startCash, gameData.smallBlind, gameData.handsBeforeRaise); }
+void GuiWrapper::SignalNetClientGameStart(const GameData &gameData) { myW->SignalNetClientGameStart(); }
 
 void GuiWrapper::SignalNetServerSuccess(int actionID) { }
 void GuiWrapper::SignalNetServerError(int errorID, int osErrorID) { }

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -37,9 +37,11 @@
 #include "handinterface.h"
 #include "game.h"
 #include "session.h"
+#include "tools.h"
 
 #include "log.h"
 #include "configfile.h"
+#include <gamedata.h>
 #include <generic/serverguiwrapper.h>
 
 #include <net/socket_msg.h>
@@ -561,7 +563,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 
 	// Errors are handled globally, not within one dialog.
 	connect(this, SIGNAL(SignalNetClientError(int, int)), this, SLOT(networkError(int, int)));
-	connect(this, SIGNAL(SignalNetClientGameStart(int, int, int, int)), this, SLOT(networkStart(int, int, int, int)));
+	connect(this, SIGNAL(SignalNetClientGameStart()), this, SLOT(networkStart()));
 
 	connect(this, SIGNAL(SignalNetServerPlayerJoined(QString)), myStartNetworkGameDialog, SLOT(addConnectedPlayer(QString)));
 	connect(this, SIGNAL(SignalNetServerPlayerLeft(QString)), myStartNetworkGameDialog, SLOT(removePlayer(QString)));
@@ -619,8 +621,12 @@ void mainWindowImpl::startNewLocalGame(newGameDialogImpl *v) {
 		//Speeds 
 		gameData.guiSpeed = myConfig->readConfigInt("GameSpeed");
 	}
+	// Set dealer pos.
+	Tools myTool;
+	myTool.getRandNumber(0, gameData.numberOfPlayers-1, 1, &gameData.startDealerPos, 0);
+
 	//Start Game!!!
-	mySession->startGame(gameData);
+	mySession->startLocalGame(gameData);
 }
 
 
@@ -2375,14 +2381,11 @@ void mainWindowImpl::networkError(int errorID, int osErrorID) {
 	myWaitingForServerGameDialog->reject();
 }
 
-void mainWindowImpl::networkStart(int numberOfPlayers, int startCash, int smallBlind, int handsBeforeRaise)
+void mainWindowImpl::networkStart()
 {
-	GameData gameData;
-	gameData.numberOfPlayers = numberOfPlayers;
-	gameData.startCash = startCash;
-	gameData.smallBlind = smallBlind;
-	gameData.handsBeforeRaise = handsBeforeRaise;
-	mySession->startGame(gameData);
+//	QMutexLocker lock(&myClientDataMutex);
+//	assert(!myClientPlayerDataList.empty());
+//	mySession->startClientGame(myClientGameData, myClientPlayerDataList);
 }
 
 void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -22,7 +22,6 @@
 
 #include "ui_mainwindow.h"
 #include "game_defs.h"
-#include <gamedata.h>
 
 #include <iostream>
 #include <string>
@@ -96,7 +95,7 @@ signals:
 	void SignalNetClientError(int errorID, int osErrorID);
 	void SignalNetClientPlayerJoined(QString playerName);
 	void SignalNetClientPlayerLeft(QString playerName);
-	void SignalNetClientGameStart(int numberOfPlayers, int startCash, int smallBlind, int handsBeforeRaise);
+	void SignalNetClientGameStart();
 	void SignalNetServerPlayerJoined(QString playerName);
 	void SignalNetServerPlayerLeft(QString playerName);
 
@@ -197,7 +196,7 @@ public slots:
 	void paintStartSplash();
 
 	void networkError(int, int);
-	void networkStart(int, int, int, int);
+	void networkStart();
 
 	void closeEvent(QCloseEvent*);