Create a more generic version of Train::get_reserved_distance

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 3e7a56b7e423da7e9d4157d88138fc7e4e4ede85..f00d0fceec719d37b51242bddb6671394ab1c407 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -74,6 +74,7 @@ private:
        unsigned address;
        std::string name;
        int priority;
+       const Train *yielding_to;
        std::vector<Vehicle *> vehicles;
        std::list<BlockRef> cur_blocks;
        std::list<BlockRef> rsv_blocks;
@@ -110,6 +111,7 @@ public:
        void set_name(const std::string &);
        const std::string &get_name() const { return name; }
        void set_priority(int);
+       void yield_to(const Train &);
        int get_priority() const { return priority; }
        Controller &get_controller() const { return *controller; }
 
@@ -154,6 +156,7 @@ private:
        void halt_event(bool);
        void block_reserved(const Block &, const Train *);
        unsigned reserve_more();
+       float get_reserved_distance_until(const Block *, bool) const;
        float get_real_speed(unsigned) const;
        unsigned find_speed(float) const;
        float get_travel_speed() const;