[atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp,1.151,1.152 selectconfiguration_widget.cpp,1.36,1.37 selectconfiguration_widget.h,1.18,1.19

Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv6610/client

Modified Files:
	atlantik.cpp selectconfiguration_widget.cpp 
	selectconfiguration_widget.h 
Log Message:
fix #61130: Client tells the game has started when it has not

Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- atlantik.cpp	29 Jun 2003 03:54:10 -0000	1.151
+++ atlantik.cpp	12 Jul 2003 17:45:21 -0000	1.152
@@ -312,6 +312,7 @@
 	connect(m_atlantikNetwork, SIGNAL(gameListClear()), this, SLOT(showSelectGame()));
 	connect(m_atlantikNetwork, SIGNAL(gameOption(QString, QString, QString, QString, QString)), m_selectConfiguration, SLOT(gameOption(QString, QString, QString, QString, QString)));
 	connect(m_atlantikNetwork, SIGNAL(endConfigUpdate()), m_selectConfiguration, SLOT(slotEndUpdate()));
+	connect(m_atlantikNetwork, SIGNAL(gameInit()), m_selectConfiguration, SLOT(initGame()));
 	connect(m_selectConfiguration, SIGNAL(startGame()), m_atlantikNetwork, SLOT(startGame()));
 	connect(m_selectConfiguration, SIGNAL(leaveGame()), m_atlantikNetwork, SLOT(leaveGame()));
 	connect(m_selectConfiguration, SIGNAL(buttonCommand(QString)), m_atlantikNetwork, SLOT(writeData(QString)));

Index: selectconfiguration_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectconfiguration_widget.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- selectconfiguration_widget.cpp	3 Jun 2003 21:06:58 -0000	1.36
+++ selectconfiguration_widget.cpp	12 Jul 2003 17:45:21 -0000	1.37
@@ -72,7 +72,7 @@
 	m_startButton = new KPushButton(SmallIcon("forward"), i18n("Start Game"), this);
 	serverButtons->addWidget(m_startButton);
 
-	connect(m_startButton, SIGNAL(clicked()), this, SLOT(connectClicked()));
+	connect(m_startButton, SIGNAL(clicked()), this, SIGNAL(startGame()));
 
     // Status indicator.
 	m_statusLabel = new QLabel(this);
@@ -85,10 +85,9 @@
 	delete m_statusLabel;
 }
 
-void SelectConfiguration::connectClicked()
+void SelectConfiguration::initGame()
 {
 	m_statusLabel->setText(i18n("Game started. Retrieving full game data..."));
-	emit startGame();
 }
 
 void SelectConfiguration::slotTokenButtonClicked()

Index: selectconfiguration_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectconfiguration_widget.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- selectconfiguration_widget.h	8 Feb 2003 15:36:03 -0000	1.18
+++ selectconfiguration_widget.h	12 Jul 2003 17:45:21 -0000	1.19
@@ -39,18 +39,17 @@
 	SelectConfiguration(QWidget *parent, const char *name=0);
 	~SelectConfiguration();
 
-	void initPage();
 	void setCanStart(const bool &canStart);
 	QString hostToConnect() const;
 	int portToConnect();
 
 private slots:
-	void connectClicked();
 	void slotTokenButtonClicked();
 	void slotTokenSelected(const QString &name);
 	void gameOption(QString title, QString type, QString value, QString edit, QString command);
 	void optionChanged();
 	void slotEndUpdate();
+	void initGame();
 
 signals:
 	void startGame();