X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=5f75a2a82bf837004352a7b537f841512a1f974d;hb=e179208d1c8370f87ce6ec87f649e5e99eb5724f;hp=90627ae4561d021dc372ac8fe3090a1a94794677;hpb=7587f018794f53974409a2aad76a0a421cea2d24;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 90627ae..5f75a2a 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -60,6 +60,7 @@ private:
 	Locomotive &loco;
 	std::list<BlockRef> cur_blocks;
 	std::list<BlockRef> rsv_blocks;
+	Block *pending_block;
 	unsigned target_speed;
 	const Route *route;
 	Msp::Time::TimeStamp try_reserve;
@@ -89,8 +90,9 @@ public:
 	const Route *get_route() const { return route; }
 	const std::string &get_status() const { return status; }
 	const Point &get_position() const { return pos; }
-	void place(Block *, unsigned);
-	bool free_block(Block *);
+	void place(Block &, unsigned);
+	bool free_block(Block &);
+	int get_entry_to_block(Block &) const;
 	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
 	void save(std::list<Msp::DataFile::Statement> &) const;
 private:
@@ -104,7 +106,7 @@ private:
 	unsigned find_speed(float) const;
 	void set_status(const std::string &);
 	void set_position(const Block::Endpoint &);
-	void release_reserved_blocks();
+	void release_blocks(std::list<BlockRef> &);
 };
 
 } // namespace Marklin