X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.h;h=34dcce69daeddb8a5f8d20255497eca8a453fcef;hb=8a2b5c1ac2fc07e280dc678165d2ca58f7d07e32;hp=85a748c204099bd4e5cff2947ce5962a687528a1;hpb=9976acc82d98c8aecde0152a72be8cc8882e35ff;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.h b/source/libr2c2/trainrouteplanner.h index 85a748c..34dcce6 100644 --- a/source/libr2c2/trainrouteplanner.h +++ b/source/libr2c2/trainrouteplanner.h @@ -32,6 +32,7 @@ private: { Train *train; float speed; + Block *first_noncritical; TrainRouter *router; const TrackChain *destination; std::vector waypoints; @@ -69,7 +70,8 @@ private: { TrainRoutingInfo *info; TrackIter track; - unsigned path; + unsigned char path; + bool critical; OccupiedTrack *occupied_tracks; float offset; float back_offset; @@ -145,7 +147,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: