New timetable system, which works like an actual timetable

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

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index 3aaf6b14137cf8401489c39918fbba135107a011..25392bd768db8f06493fe414fb6f9e038068cec1 100644 (file)
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -35,6 +35,7 @@ public:
                void name(const std::string &);
                void quantized_speed();
                void router();
+               void timetable();
                void vehicle(ArticleNumber);
        };
 
@@ -51,6 +52,7 @@ private:
        const VehicleType &loco_type;
        unsigned address;
        std::string protocol;
+       unsigned loco_id;
        std::string name;
        const Train *preceding_train;
        std::vector<Vehicle *> vehicles;
@@ -96,6 +98,7 @@ public:
        float get_speed() const;
        float get_quantized_speed() const;
        unsigned get_speed_step() const { return current_speed_step; }
+       float get_maximum_speed() const;
        bool get_function(unsigned) const;
        unsigned get_functions() const { return functions; }
 
@@ -112,7 +115,7 @@ public:
                return 0;
        }
 
-       void place(const BlockIter &);
+       bool place(const BlockIter &);
        void unplace();
        bool is_placed() const { return !allocator.empty(); }
        void stop_at(Block *);