X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=b76d663ab5f8caea318ec2bf612bc1d4ab9d83c4;hb=67cd1b26d2833903e51b91e167a3d1f7ae884a31;hp=0ed2e118e7bb4e5ef503769f7ef3c765848752e2;hpb=bb75bc76ddd99e7d3edaf6e7dbd3719ea332052c;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h index 0ed2e11..b76d663 100644 --- a/source/libr2c2/trainrouteplanner.h +++ b/source/libr2c2/trainrouteplanner.h @@ -34,7 +34,6 @@ private: float speed; Block *first_noncritical; TrainRouter *router; - const TrackChain *destination; std::vector waypoints; std::vector metrics; bool has_duration; @@ -78,7 +77,7 @@ private: TrainState state; Msp::Time::TimeDelta delay; Msp::Time::TimeDelta duration; - int waypoint; + unsigned waypoint; float distance_traveled; float remaining_estimate; Msp::Time::TimeDelta wait_time; @@ -147,7 +146,7 @@ public: Result plan(); void plan_async(); Result check(); - Result get_result() { return result; } + Result get_result() const { return result; } const std::list &get_routes_for(const Train &) const; const std::list &get_sequence_for(const Train &) const; private: