X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;fp=source%2Fnetwork%2Fserver.cpp;h=73cee24a4f0c2f5d7676b98a507be2f25dcce6fd;hb=d0af7846e05691d65d8021e46c8f81e8ca05199a;hp=d4e2049472c94caf42da31f7ac2042ecc0246e8d;hpb=66c2c7ca5a4bd369293959bc211b040834343381;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index d4e2049..73cee24 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -4,6 +4,8 @@
 #include "libr2c2/driver.h"
 #include "libr2c2/route.h"
 #include "libr2c2/train.h"
+#include "libr2c2/trainrouter.h"
+#include "libr2c2/trainstatus.h"
 #include "libr2c2/vehicletype.h"
 #include "server.h"
 
@@ -65,8 +67,7 @@ void Server::train_added(Train &train)
 {
 	train.signal_control_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_control_changed), sigc::ref(train)));
 	train.signal_function_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_function_changed), sigc::ref(train)));
-	train.signal_route_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_route_changed), sigc::ref(train)));
-	train.signal_status_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_status_changed), sigc::ref(train)));
+	train.signal_ai_event.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_ai_event), sigc::ref(train)));
 
 	TrainInfoPacket pkt;
 	pkt.address = train.get_address();
@@ -96,13 +97,16 @@ void Server::train_function_changed(const Train &train, unsigned, bool)
 	send(pkt);
 }
 
-void Server::train_route_changed(const Train &train, const Route *route)
+void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Message &ev)
 {
-	TrainRoutePacket pkt;
-	pkt.address = train.get_address();
-	if(route)
-		pkt.route = route->get_name();
-	send(pkt);
+	if(ev.type=="route-changed")
+	{
+		TrainRoutePacket pkt;
+		pkt.address = train.get_address();
+		if(const Route *route = ev.value.value<const Route *>())
+			pkt.route = route->get_name();
+		send(pkt);
+	}
 }
 
 void Server::train_status_changed(const Train &train, const string &status)
@@ -201,11 +205,11 @@ void Server::Connection::handshake_done()
 			pkt.status = status->get_status();
 			comm.send(pkt);
 		}
-		if(train.get_route())
+		if(TrainRouter *router = dynamic_cast<TrainRouter *>(train.get_tagged_ai("router")))
 		{
 			TrainRoutePacket pkt;
 			pkt.address = train.get_address();
-			pkt.route = train.get_route()->get_name();
+			pkt.route = router->get_route()->get_name();
 			comm.send(pkt);
 		}
 	}
@@ -259,11 +263,11 @@ void Server::Connection::receive(const TrainRoutePacket &pkt)
 	{
 		Train &train = server.layout.get_train(pkt.address);
 		if(pkt.route.empty())
-			train.set_route(0);
+			train.ai_message(TrainAI::Message("clear-route"));
 		else
 		{
 			Route &route = server.layout.get_route(pkt.route);
-			train.set_route(&route);
+			train.ai_message(TrainAI::Message("set-route", &route));
 		}
 	}
 	catch(const exception &e)