From atlantik-devel  Thu Nov 28 21:38:26 2002
From: kde () office ! kde ! org
Date: Thu, 28 Nov 2002 21:38:26 +0000
To: atlantik-devel
Subject: [atlantik-cvs] CVS: kdegames/atlantik/libatlantikclient atlantik_network.cpp,1.67,1.68
X-MARC-Message: https://marc.info/?l=atlantik-devel&m=103851960519112

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

Modified Files:
	atlantik_network.cpp 
Log Message:
cleanup in token geometry, animation works again

Index: atlantik_network.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- atlantik_network.cpp	2002/11/28 11:59:24	1.67
+++ atlantik_network.cpp	2002/11/28 21:38:24	1.68
@@ -458,12 +458,18 @@
 						bool directMove = false;
 
 						Estate *estate = m_atlanticCore->findEstate(a.value().toInt());
-						if (estate)
-							player->setLocation(estate);
 
 						a = e.attributeNode(QString("directmove"));
 						if (!a.isNull())
 							directMove = a.value().toInt();
+
+						if (player && estate)
+						{
+							if (directMove)
+								player->setLocation(estate);
+							else
+								player->setDestination(estate);
+						}
 					}
 
 					// Emit signal so GUI implementations can create view(s)

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