X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=404faa94a6fa83826f46403fd7ff08110d1d231d;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=8db68717ddf27743b903d85c94976df10a605f83;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index 8db6871..404faa9 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,20 +1,20 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2009-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <msp/net/inet.h>
-#include "libmarklin/route.h"
-#include "libmarklin/train.h"
-#include "libmarklin/vehicletype.h"
+#include "libr2c2/route.h"
+#include "libr2c2/train.h"
+#include "libr2c2/vehicletype.h"
 #include "server.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace Marklin {
+namespace R2C2 {
 
 Server::Server(Layout &l):
 	layout(l),
@@ -54,7 +54,7 @@ void Server::train_added(Train &train)
 
 	TrainInfoPacket pkt;
 	pkt.address = train.get_address();
-	pkt.loco_type = train.get_locomotive_type().get_article_number();
+	pkt.loco_type = train.get_locomotive_type().get_article_number().str();
 	pkt.name = train.get_name();
 	send(pkt);
 }
@@ -119,11 +119,11 @@ Server::Connection::~Connection()
 
 void Server::Connection::handshake_done()
 {
-	const map<string, Route *> &routes = server.layout.get_routes();
-	for(map<string, Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+	const set<Route *> &routes = server.layout.get_routes();
+	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 	{
 		RouteInfoPacket pkt;
-		pkt.name = i->first;
+		pkt.name = (*i)->get_name();
 		comm.send(pkt);
 	}
 
@@ -135,7 +135,7 @@ void Server::Connection::handshake_done()
 		{
 			TrainInfoPacket pkt;
 			pkt.address = train.get_address();
-			pkt.loco_type = train.get_locomotive_type().get_article_number();
+			pkt.loco_type = train.get_locomotive_type().get_article_number().str();
 			pkt.name = train.get_name();
 			comm.send(pkt);
 		}
@@ -222,4 +222,4 @@ void Server::Connection::error(const string &msg)
 	comm.send(pkt);
 }
 
-} // namespace Marklin
+} // namespace R2C2