Foundations of using physics simulation for trains

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

diff --git a/source/network/train.h b/source/network/train.h
index 0a6a8a8f9063700dadf6bdb1d26c8f6eda835fbf..74c6ccb6cae38d28d3216f0ed6d6dd53cc5dd7b7 100644 (file)
--- a/source/network/train.h
+++ b/source/network/train.h
@@ -20,8 +20,7 @@ class NetTrain
 {
 public:
        sigc::signal<void, const std::string &> signal_name_changed;
-       sigc::signal<void, unsigned> signal_speed_changed;
-       sigc::signal<void, bool> signal_reverse_changed;
+       sigc::signal<void, const std::string &, float> signal_control_changed;
        sigc::signal<void, unsigned, bool> signal_function_changed;
        sigc::signal<void, const std::string &> signal_route_changed;
        sigc::signal<void, const std::string &> signal_status_changed;
@@ -31,8 +30,7 @@ private:
        const LocoType &loco_type;
        unsigned address;
        std::string name;
-       unsigned speed;
-       bool reverse;
+       std::map<std::string, float> controls;
        unsigned functions;
        std::string route;
        std::string status;
@@ -43,16 +41,14 @@ public:
        const LocoType &get_loco_type() const { return loco_type; }
        unsigned get_address() const { return address; }
        const std::string &get_name() const { return name; }
-       void set_speed(unsigned);
-       unsigned get_speed() const { return speed; }
-       void set_reverse(bool);
-       bool get_reverse() const { return reverse; }
+       void set_control(const std::string &, float);
+       float get_control(const std::string &) const;
        void set_function(unsigned, bool);
        bool get_function(unsigned i) const { return (functions>>i)&1; }
        void set_route(const std::string &);
        const std::string &get_route() const { return route; }
 
-       void process_packet(const TrainSpeedPacket &);
+       void process_packet(const TrainControlPacket &);
        void process_packet(const TrainFunctionPacket &);
        void process_packet(const TrainRoutePacket &);
        void process_packet(const TrainStatusPacket &);