X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=aced6f7202f2e6dc894af1ec686fb4fb51a1c72f;hb=9cb5f9ef3c0eaac499ef5d045c513116d6809e56;hp=d4e2049472c94caf42da31f7ac2042ecc0246e8d;hpb=64feb0c70888bfc7c11b05dcc71be495f255c039;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index d4e2049..aced6f7 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"
 
@@ -32,6 +34,9 @@ Server::Server(Layout &l):
 	listen_sock.signal_data_available.connect(sigc::mem_fun(this, &Server::incoming_connection));
 }
 
+Server::~Server()
+{ }
+
 void Server::use_event_dispatcher(IO::EventDispatcher &ed)
 {
 	event_disp = &ed;
@@ -54,7 +59,7 @@ void Server::driver_state_changed()
 	send(pkt);
 }
 
-void Server::emergency(const string &msg)
+void Server::emergency(Block *, const string &msg)
 {
 	EmergencyPacket pkt;
 	pkt.message = msg;
@@ -65,8 +70,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();
@@ -74,9 +78,8 @@ void Server::train_added(Train &train)
 	pkt.name = train.get_name();
 	send(pkt);
 
-	TrainStatus *status = new TrainStatus(train);
-	status->set_tag("server:status");
-	status->signal_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_status_changed), sigc::ref(train)));
+	if(!train.get_ai_of_type<TrainStatus>())
+		new TrainStatus(train);
 }
 
 void Server::train_control_changed(const Train &train, const string &control, float value)
@@ -96,21 +99,23 @@ void Server::train_function_changed(const Train &train, unsigned, bool)
 	send(pkt);
 }
 
-void Server::train_route_changed(const Train &train, const Route *route)
-{
-	TrainRoutePacket pkt;
-	pkt.address = train.get_address();
-	if(route)
-		pkt.route = route->get_name();
-	send(pkt);
-}
-
-void Server::train_status_changed(const Train &train, const string &status)
+void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Message &ev)
 {
-	TrainStatusPacket pkt;
-	pkt.address = train.get_address();
-	pkt.status = status;
-	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);
+	}
+	else if(ev.type=="status-changed")
+	{
+		TrainStatusPacket pkt;
+		pkt.address = train.get_address();
+		pkt.status = ev.value.value<std::string>();
+		send(pkt);
+	}
 }
 
 template<typename P>
@@ -155,7 +160,7 @@ void Server::Connection::handshake_done()
 		comm.send(pkt);
 	}
 
-	const set<Route *> &routes = server.layout.get_routes();
+	const set<Route *> &routes = server.layout.get_all<Route>();
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 		if(!(*i)->is_temporary())
 		{
@@ -194,18 +199,18 @@ void Server::Connection::handshake_done()
 			pkt.functions = train.get_functions();
 			comm.send(pkt);
 		}
-		if(TrainStatus *status = dynamic_cast<TrainStatus *>(train.get_tagged_ai("server:status")))
+		if(TrainStatus *status = train.get_ai_of_type<TrainStatus>())
 		{
 			TrainStatusPacket pkt;
 			pkt.address = train.get_address();
 			pkt.status = status->get_status();
 			comm.send(pkt);
 		}
-		if(train.get_route())
+		if(TrainRouter *router = train.get_ai_of_type<TrainRouter>())
 		{
 			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 +264,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)