[atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp,1.121.6.18,1.121.6.19 selectconfiguration_widget.cpp,1.26.6.5,1.26.6.6 selectconfiguration_widget.h,1.12.6.3,1.12.6.4

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

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

CCMAIL: [email protected]


Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.121.6.18
retrieving revision 1.121.6.19
diff -u -d -r1.121.6.18 -r1.121.6.19
--- atlantik.cpp	23 Jun 2003 02:54:53 -0000	1.121.6.18
+++ atlantik.cpp	12 Jul 2003 17:49:21 -0000	1.121.6.19
@@ -302,6 +302,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.26.6.5
retrieving revision 1.26.6.6
diff -u -d -r1.26.6.5 -r1.26.6.6
--- selectconfiguration_widget.cpp	23 Jun 2003 02:54:53 -0000	1.26.6.5
+++ selectconfiguration_widget.cpp	12 Jul 2003 17:49:21 -0000	1.26.6.6
@@ -57,7 +57,7 @@
 	m_connectButton = new KPushButton(SmallIcon("forward"), i18n("Start Game"), this);
 	serverButtons->addWidget(m_connectButton);
 
-	connect(m_connectButton, SIGNAL(clicked()), this, SLOT(connectClicked()));
+	connect(m_connectButton, SIGNAL(clicked()), this, SIGNAL(startGame()));
 
     // Status indicator.
 	m_statusLabel = new QLabel(this);
@@ -70,10 +70,9 @@
 	delete m_statusLabel;
 }
 
-void SelectConfiguration::connectClicked()
+void SelectConfiguration::initGame()
 {
 	m_statusLabel->setText(i18n("Game started. Retrieving full game data..."));
-	emit startGame();
 }
 
 void SelectConfiguration::gameOption(QString title, QString type, QString value, QString edit, QString command)

Index: selectconfiguration_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectconfiguration_widget.h,v
retrieving revision 1.12.6.3
retrieving revision 1.12.6.4
diff -u -d -r1.12.6.3 -r1.12.6.4
--- selectconfiguration_widget.h	23 Jun 2003 02:54:53 -0000	1.12.6.3
+++ selectconfiguration_widget.h	12 Jul 2003 17:49:21 -0000	1.12.6.4
@@ -38,16 +38,15 @@
 	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 gameOption(QString title, QString type, QString value, QString edit, QString command);
 	void optionChanged();
 	void slotEndUpdate();
+	void initGame();
 
 signals:
 	void startGame();