X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fnetwork%2Fserver.cpp;fp=source%2Fnetwork%2Fserver.cpp;h=43dce66cfc7353022df95b4893fba47710df31d6;hb=3b37ee041af581e47646c2487e7e302c55bd8cd7;hp=c60eb70e109f296ccad3a820f10df62c958a6798;hpb=7b4155fa0581d7c5fe198e4fb1dea61fa0846eec;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index c60eb70..43dce66 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -1,6 +1,7 @@
 #include <msp/core/refptr.h>
 #include <msp/net/inet.h>
 #include <msp/net/resolve.h>
+#include "libr2c2/aicontrol.h"
 #include "libr2c2/catalogue.h"
 #include "libr2c2/driver.h"
 #include "libr2c2/route.h"
@@ -100,7 +101,7 @@ void Server::train_function_changed(const Train &train, unsigned, bool)
 	send(pkt);
 }
 
-void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Message &ev)
+void Server::train_ai_event(const Train &train, TrainAI &ai, const TrainAI::Message &ev)
 {
 	if(ev.type=="route-changed")
 	{
@@ -117,6 +118,18 @@ void Server::train_ai_event(const Train &train, TrainAI &, const TrainAI::Messag
 		pkt.status = ev.value.value<std::string>();
 		send(pkt);
 	}
+	else if(ev.type=="target-speed-changed" || ev.type=="reverse-changed")
+	{
+		AIControl *control = dynamic_cast<AIControl *>(&ai);
+		if(control)
+		{
+			TrainAIControlPacket pkt;
+			pkt.address = train.get_address();
+			pkt.target_speed = control->get_target_speed();
+			pkt.reverse = control->get_reverse();
+			send(pkt);
+		}
+	}
 }
 
 template<typename P>
@@ -175,6 +188,14 @@ void Server::Connection::handshake_done()
 			pkt.name = train.get_name();
 			comm.send(pkt);
 		}
+		if(AIControl *control = train.get_ai_of_type<AIControl>())
+		{
+			TrainAIControlPacket pkt;
+			pkt.address = train.get_address();
+			pkt.target_speed = control->get_target_speed();
+			pkt.reverse = control->get_reverse();
+			comm.send(pkt);
+		}
 		for(unsigned j=0;; ++j)
 		{
 			const char *name = train.get_controller().enumerate_controls(j);
@@ -252,6 +273,20 @@ void Server::Connection::receive(const TrainFunctionPacket &pkt)
 	}
 }
 
+void Server::Connection::receive(const TrainAIControlPacket &pkt)
+{
+	try
+	{
+		Train &train = server.layout.get_train(pkt.address);
+		train.ai_message(TrainAI::Message("set-target-speed", pkt.target_speed));
+		train.ai_message(TrainAI::Message("set-reverse", pkt.reverse));
+	}
+	catch(const exception &e)
+	{
+		error(e.what());
+	}
+}
+
 void Server::Connection::receive(const TrainRoutePacket &pkt)
 {
 	try