[prev in list] [next in list] [prev in thread] [next in thread] 

List:       atlantik-devel
Subject:    [atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp,1.117,1.118
From:       kde () office ! kde ! org
Date:       2002-08-30 12:42:59
[Download RAW message or body]

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

Modified Files:
	atlantik.cpp 
Log Message:
should fix back and forth connect

Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- atlantik.cpp	2002/08/02 14:26:42	1.117
+++ atlantik.cpp	2002/08/30 12:42:55	1.118
@@ -65,8 +65,9 @@
 	m_playerSelf = 0;
 	m_atlantikNetwork = 0;
 
-	// Game core
+	// Game and network core
 	m_atlanticCore = new AtlanticCore(this, "atlanticCore");
+	initNetworkObject();
 
 	connect(m_atlanticCore, SIGNAL(removeGUI(Trade *)), this, SLOT(removeGUI(Trade \
*)));  
@@ -132,10 +133,7 @@
 	QCString host = args->getOption("host");	
 	QCString port = args->getOption("port");	
 	if (!host.isNull() && !port.isNull())
-	{
-		initNetworkObject();
 		m_atlantikNetwork->serverConnect(host, port.toInt());
-	}
 	else
 		showSelectServer();
 }
@@ -227,6 +225,9 @@
 		m_selectGame = 0;
 	}
 	initNetworkObject();
+
+	connect(m_atlantikNetwork, SIGNAL(gameListClear()), this, SLOT(showSelectGame())); \
// disconnect from selectGame implied by deletion above +	connect(m_selectServer, \
SIGNAL(serverConnect(const QString, int)), m_atlantikNetwork, \
SLOT(serverConnect(const QString, int)));  }
 
 void Atlantik::showSelectGame()
@@ -476,8 +477,6 @@
 	{
 		m_atlantikNetwork->reset();
 		return;
-		m_atlantikNetwork->closeNow();
-		delete m_atlantikNetwork;
 	}
 
 	m_atlantikNetwork = new AtlantikNetwork(m_atlanticCore, this, "atlantikNetwork");
@@ -504,10 +503,4 @@
 	connect(this, SIGNAL(jailCard()), m_atlantikNetwork, SLOT(jailCard()));
 	connect(this, SIGNAL(jailPay()), m_atlantikNetwork, SLOT(jailPay()));
 	connect(this, SIGNAL(jailRoll()), m_atlantikNetwork, SLOT(jailRoll()));
-	
-	if (m_selectServer)
-	{
-		connect(m_selectServer, SIGNAL(serverConnect(const QString, int)), \
                m_atlantikNetwork, SLOT(serverConnect(const QString, int)));
-		connect(m_atlantikNetwork, SIGNAL(gameListClear()), this, SLOT(showSelectGame()));
-	}
 }

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-cvs


[prev in list] [next in list] [prev in thread] [next in thread]