X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=2bf641297309ad2e3a5ba304f6502af00fbc6fad;hb=6ba6af3637c299ab00828c49de9151429488cc17;hp=dd0dd8b927bde2a43ea9522d30aaef3f99cd912a;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index dd0dd8b..2bf6412 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -6,9 +6,9 @@ Distributed under the GPL
 */
 
 #include <msp/net/inet.h>
-#include "libmarklin/locotype.h"
 #include "libmarklin/route.h"
 #include "libmarklin/train.h"
+#include "libmarklin/vehicletype.h"
 #include "server.h"
 
 using namespace std;
@@ -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);
 		}