X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetwork%2Fserver.cpp;h=dd0dd8b927bde2a43ea9522d30aaef3f99cd912a;hb=e990eb02d42cc4b9ff679b947a6911f79472f8f5;hp=2e3248f28878bf0a7000d874895c69d2675f3056;hpb=651698847d5293cfb15b6fb23a394701388c0151;p=r2c2.git

diff --git a/source/network/server.cpp b/source/network/server.cpp
index 2e3248f..dd0dd8b 100644
--- a/source/network/server.cpp
+++ b/source/network/server.cpp
@@ -47,8 +47,7 @@ void Server::incoming_connection()
 
 void Server::train_added(Train &train)
 {
-	train.signal_target_speed_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_speed_changed), sigc::ref(train)));
-	train.signal_reverse_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Server::train_reverse_changed), sigc::ref(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)));
@@ -60,21 +59,12 @@ void Server::train_added(Train &train)
 	send(pkt);
 }
 
-void Server::train_speed_changed(const Train &train, unsigned speed)
+void Server::train_control_changed(const Train &train, const string &control, float value)
 {
-	TrainSpeedPacket pkt;
+	TrainControlPacket pkt;
 	pkt.address = train.get_address();
-	pkt.speed = speed;
-	pkt.reverse = train.get_reverse();
-	send(pkt);
-}
-
-void Server::train_reverse_changed(const Train &train, bool reverse)
-{
-	TrainSpeedPacket pkt;
-	pkt.address = train.get_address();
-	pkt.speed = train.get_target_speed();
-	pkt.reverse = reverse;
+	pkt.control = control;
+	pkt.value = value;
 	send(pkt);
 }
 
@@ -149,13 +139,7 @@ void Server::Connection::handshake_done()
 			pkt.name = train.get_name();
 			comm.send(pkt);
 		}
-		{
-			TrainSpeedPacket pkt;
-			pkt.address = train.get_address();
-			pkt.speed = train.get_target_speed();
-			pkt.reverse = train.get_reverse();
-			comm.send(pkt);
-		}
+		// XXX Need control enumeration to send control packets
 		{
 			TrainFunctionPacket pkt;
 			pkt.address = train.get_address();
@@ -184,15 +168,12 @@ void Server::Connection::end_of_file()
 	stale = true;
 }
 
-void Server::Connection::receive(const TrainSpeedPacket &pkt)
+void Server::Connection::receive(const TrainControlPacket &pkt)
 {
 	try
 	{
 		Train &train = server.layout.get_train(pkt.address);
-		if(pkt.reverse!=train.get_reverse())
-			train.set_reverse(pkt.reverse);
-		else
-			train.set_speed(pkt.speed);
+		train.set_control(pkt.control, pkt.value);
 	}
 	catch(const Exception &e)
 	{