X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=b579d7f37deba40ba47d607baabf0e42817e7de7;hb=9b68c21ebf8ce26d92246ecd4a392d2908b511f7;hp=60a0c0824ade3030e52497ee0ec6a19b4f79f679;hpb=651698847d5293cfb15b6fb23a394701388c0151;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 60a0c08..b579d7f 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -50,7 +50,8 @@ private:
 		Block *block;
 		unsigned entry;
 
-		BlockRef(Block *s, unsigned e): block(s), entry(e) { }
+		BlockRef(Block *, unsigned);
+		BlockRef next() const;
 	};
 
 	struct RealSpeed
@@ -75,6 +76,8 @@ private:
 	Msp::Time::TimeStamp stop_timeout;
 	unsigned functions;
 	const Route *route;
+	const Route *next_route;
+	bool end_of_route;
 	std::string status;
 
 	Msp::Time::TimeStamp last_entry_time;
@@ -107,6 +110,7 @@ public:
 	unsigned get_functions() const { return functions; }
 
 	void set_route(const Route *);
+	void go_to(const Track &);
 	const Route *get_route() const { return route; }
 	void place(Block &, unsigned);
 	bool is_placed() const { return !cur_blocks.empty(); }