X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Ftrain.cpp;h=52eca849b30421c79591f6296ef6a266f125b6a0;hb=3b37ee041af581e47646c2487e7e302c55bd8cd7;hp=5c4b457bad9bb3093edb962887d567798e6d8777;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git

diff --git a/source/network/train.cpp b/source/network/train.cpp
index 5c4b457..52eca84 100644
--- a/source/network/train.cpp
+++ b/source/network/train.cpp
@@ -1,22 +1,17 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2009  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include "client.h"
 #include "train.h"
 
 using namespace std;
 
-namespace Marklin {
+namespace R2C2 {
 
 NetTrain::NetTrain(Client &c, const TrainInfoPacket &pkt):
 	client(c),
-	loco_type(client.get_catalogue().get_locomotive(pkt.loco_type)),
+	loco_type(client.get_catalogue().get<VehicleType>(pkt.loco_type)),
 	address(pkt.address),
 	name(pkt.name),
+	target_speed(0),
+	reverse(false),
 	functions(0)
 { }
 
@@ -32,6 +27,30 @@ void NetTrain::set_control(const string &c, float v)
 	client.send(pkt);
 }
 
+float NetTrain::get_control(const string &c) const
+{
+	map<string, float>::const_iterator i = controls.find(c);
+	return i!=controls.end() ? i->second : 0;
+}
+
+void NetTrain::set_target_speed(float s)
+{
+	TrainAIControlPacket pkt;
+	pkt.address = address;
+	pkt.target_speed = s;
+	pkt.reverse = reverse;
+	client.send(pkt);
+}
+
+void NetTrain::set_reverse(bool r)
+{
+	TrainAIControlPacket pkt;
+	pkt.address = address;
+	pkt.target_speed = target_speed;
+	pkt.reverse = r;
+	client.send(pkt);
+}
+
 void NetTrain::set_function(unsigned i, bool set)
 {
 	TrainFunctionPacket pkt;
@@ -70,6 +89,21 @@ void NetTrain::process_packet(const TrainFunctionPacket &pkt)
 			signal_function_changed.emit(i, (functions>>i)&1);
 }
 
+void NetTrain::process_packet(const TrainAIControlPacket &pkt)
+{
+	if(pkt.target_speed!=target_speed)
+	{
+		target_speed = pkt.target_speed;
+		signal_target_speed_changed.emit(target_speed);
+	}
+
+	if(pkt.reverse!=reverse)
+	{
+		reverse = pkt.reverse;
+		signal_reverse_changed.emit(reverse);
+	}
+}
+
 void NetTrain::process_packet(const TrainStatusPacket &pkt)
 {
 	status = pkt.status;
@@ -82,4 +116,4 @@ void NetTrain::process_packet(const TrainRoutePacket &pkt)
 	signal_route_changed.emit(route);
 }
 
-} // namespace Marklin
+} // namespace R2C2