X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=f00d0fceec719d37b51242bddb6671394ab1c407;hb=cc0ee0a5e71590960bc8cb7baee7a10ef09ce3f0;hp=319119b93828fd745639a7a37b8c1ae3d6a69794;hpb=182ee232f01d5bb25ddc4cf6e00249698871412f;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 319119b..f00d0fc 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -74,10 +74,13 @@ 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;
 	Block *pending_block;
+	bool reserving;
+	bool advancing;
 	Controller *controller;
 	Timetable *timetable;
 	bool active;
@@ -108,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; }
 
@@ -152,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;