[atlantik-cvs] CVS: kdegames/atlantik/libatlantikclient atlantik_network.cpp,1.65.4.16,1.65.4.17 atlantik_network.h,1.34.4.7,1.34.4.8

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

Modified Files:
      Tag: KDE_3_1_BRANCH
	atlantik_network.cpp atlantik_network.h 
Log Message:
backport of various fixes

Index: atlantik_network.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.cpp,v
retrieving revision 1.65.4.16
retrieving revision 1.65.4.17
diff -u -d -r1.65.4.16 -r1.65.4.17
--- atlantik_network.cpp	23 Jun 2003 01:24:38 -0000	1.65.4.16
+++ atlantik_network.cpp	23 Jun 2003 02:54:54 -0000	1.65.4.17
@@ -351,6 +351,7 @@
 							emit gameOption(eOption.attributeNode(QString("title")).value(), eOption.attributeNode(QString("type")).value(), eOption.attributeNode(QString("value")).value(), eOption.attributeNode(QString("edit")).value(), eOption.attributeNode(QString("command")).value());
 					}
 				}
+				emit endConfigUpdate();
 			}
 			else if (e.tagName() == "gameupdate")
 			{
@@ -429,6 +430,10 @@
 					if (player && !a.isNull())
 						player->setMoney(a.value().toInt());
 
+					a = e.attributeNode(QString("master"));
+					if (player && !a.isNull())
+						player->setMaster(a.value().toInt());
+
 					a = e.attributeNode(QString("bankrupt"));
 					if (player && !a.isNull())
 						player->setBankrupt(a.value().toInt());
@@ -665,7 +670,10 @@
 							{
 								Player *player = m_atlanticCore->findPlayer(e_player.attributeNode(QString("playerid")).value().toInt());
 								if (trade && player)
+								{
 									trade->addPlayer(player);
+									QObject::connect(m_atlanticCore, SIGNAL(removePlayer(Player *)), trade, SLOT(removePlayer(Player *)));
+								}
 							}
 							n_player = n_player.nextSibling();
 						}

Index: atlantik_network.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.h,v
retrieving revision 1.34.4.7
retrieving revision 1.34.4.8
diff -u -d -r1.34.4.7 -r1.34.4.8
--- atlantik_network.h	18 Jun 2003 00:58:49 -0000	1.34.4.7
+++ atlantik_network.h	23 Jun 2003 02:54:54 -0000	1.34.4.8
@@ -123,6 +123,8 @@
 	void addCloseButton();
 
 	void gameOption(QString title, QString type, QString value, QString edit, QString command);
+	void endConfigUpdate();
+
 	void gameListClear();
 	void gameListEndUpdate();
 	void gameListAdd(QString gameId, QString name, QString description, QString players, QString gameType, bool canBeJoined);