From atlantik-devel  Sun May 30 16:02:14 2004
From: kde () office ! kde ! org
Date: Sun, 30 May 2004 16:02:14 +0000
To: atlantik-devel
Subject: [atlantik-cvs] CVS: kdegames/atlantik/libatlantikclient
Message-Id: <40BA0586.mail6ZB114YG4 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=atlantik-devel&m=108593294506905

Update of /home/kde/kdegames/atlantik/libatlantikclient
In directory office:/tmp/cvs-serv9002

Modified Files:
	atlantik_network.cpp atlantik_network.h 
Log Message:
Fixed missing gameconfig options for 0.7.0/KDE 3.3.
CCMAIL: 82464-done@bugs.kde.org


Index: atlantik_network.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- atlantik_network.cpp	28 May 2004 20:30:00 -0000	1.100
+++ atlantik_network.cpp	30 May 2004 16:02:09 -0000	1.101
@@ -41,6 +41,7 @@
 	m_textStream = new QTextStream(this);
 	m_textStream->setCodec(QTextCodec::codecForName("utf8"));
 	m_playerId = -1;
+	m_serverVersion = "";
 
 	QObject::connect(this, SIGNAL(readyRead()), this, SLOT(slotRead()));
 	QObject::connect(this, SIGNAL(lookupFinished(int)),
@@ -250,7 +251,13 @@
 		if(!e.isNull())
 		{
 			if (e.tagName() == "server")
+			{
+				a = e.attributeNode( QString("version") );
+				if ( !a.isNull() )
+					m_serverVersion = a.value();
+
 				emit receivedHandshake();
+			}
 			else if (e.tagName() == "msg")
 			{
 				a = e.attributeNode(QString("type"));
@@ -412,7 +419,7 @@
 					}
 
 					QString status = e.attributeNode(QString("status")).value();
-					if ( playerSelf && playerSelf->game() == game )
+					if ( m_serverVersion.left(4) == "0.9." || (playerSelf && playerSelf->game() == game) )
 					{
 						if (status == "config")
 							emit gameConfig();

Index: atlantik_network.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- atlantik_network.h	10 Feb 2004 19:46:36 -0000	1.50
+++ atlantik_network.h	30 May 2004 16:02:09 -0000	1.51
@@ -146,6 +146,7 @@
 	QTextStream *m_textStream;
 
 	int m_playerId;
+	QString m_serverVersion;
 
 	QMap<Player *, int> m_playerLocationMap;
 	QMap<int, Auction *> m_auctions;

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