X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.h;h=42bbc375b25b1346fc55b457b04cf41ca45dab22;hb=5c1ddd2f213af3fea15237e02f7da112c0abba36;hp=6b384f8220b9eece5e5873ead9ab07283d601755;hpb=54392d65e2053d1eacb4cfcc435f1013993f2973;p=r2c2.git

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index 6b384f8..42bbc37 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -63,8 +63,8 @@ private:
 	Msp::Time::TimeStamp stop_timeout;
 	unsigned functions;
 
+	BlockIter last_entry_block;
 	Msp::Time::TimeStamp last_entry_time;
-	float travel_dist;
 	bool pure_speed;
 	SpeedQuantizer *speed_quantizer;
 	bool accurate_position;
@@ -133,7 +133,7 @@ private:
 	void block_state_changed(Block &, Block::State);
 	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
-	float get_reserved_distance_until(const Block *, bool) const;
+	float get_reserved_distance_until(const Block *) const;
 };
 
 } // namespace R2C2