X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=79a6036e6d1fbe5b8c7a6c23a70f616a8d6c6216;hb=54cb832334a83fc266b59e2c9b60ee936db7118f;hp=3076c3978efa5ed0b27edae5cec7b4130e72afa7;hpb=528c4f8760ac54fb2d1f3002248ecf6774956030;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h index 3076c39..79a6036 100644 --- a/source/libr2c2/trainrouteplanner.h +++ b/source/libr2c2/trainrouteplanner.h @@ -31,6 +31,7 @@ private: struct TrainRoutingInfo { Train *train; + float length; float speed; Block *first_noncritical; TrainRouter *router; @@ -81,6 +82,7 @@ private: float distance_traveled; float remaining_estimate; Msp::Time::TimeDelta wait_time; + Msp::Time::TimeDelta estimated_wait; int blocked_by; TrainRoutingState(TrainRoutingInfo &); @@ -88,6 +90,7 @@ private: ~TrainRoutingState(); Msp::Time::TimeDelta get_time_to_next_track() const; + Msp::Time::TimeDelta get_time_to_pass(Track &) const; bool is_occupying(Track &) const; bool check_arrival(); void advance(float);