Foundations of using physics simulation for trains

[r2c2.git] / source / network / server.h

diff --git a/source/network/server.h b/source/network/server.h
index 41bb8e9b50bc9765767efa7ae5a1c09868e66d13..056b0dd089d0c5b2b285136167834f8f81c0947a 100644 (file)
--- a/source/network/server.h
+++ b/source/network/server.h
@@ -21,7 +21,7 @@ namespace Marklin {
 class Server
 {
 private:
-       struct Connection: private Msp::Net::PacketReceiver<TrainSpeedPacket>,
+       struct Connection: private Msp::Net::PacketReceiver<TrainControlPacket>,
                private Msp::Net::PacketReceiver<TrainFunctionPacket>,
                private Msp::Net::PacketReceiver<TrainRoutePacket>
        {
@@ -35,7 +35,7 @@ private:
 
                void handshake_done();
                void end_of_file();
-               virtual void receive(const TrainSpeedPacket &);
+               virtual void receive(const TrainControlPacket &);
                virtual void receive(const TrainFunctionPacket &);
                virtual void receive(const TrainRoutePacket &);
                void error(const std::string &);
@@ -54,8 +54,7 @@ private:
        void incoming_connection();
 
        void train_added(Train &);
-       void train_speed_changed(const Train &, unsigned);
-       void train_reverse_changed(const Train &, bool);
+       void train_control_changed(const Train &, const std::string &, float);
        void train_function_changed(const Train &, unsigned, bool);
        void train_route_changed(const Train &, const Route *);
        void train_status_changed(const Train &, const std::string &);