X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=87fd4a5c839672db096ee79f87b89f7ed886c986;hb=283542ae424b94786652fbf0c67b883b63a8e7a0;hp=d637cc03b03735d67e59fa3f7aa7f70b5c7c97f4;hpb=c18c79f72c065933b00c6092d9d5054f9e82b8df;p=r2c2.git diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h index d637cc0..87fd4a5 100644 --- a/source/libmarklin/train.h +++ b/source/libmarklin/train.h @@ -81,6 +81,7 @@ private: std::vector vehicles; BlockList blocks; BlockList::iterator cur_blocks_end; + BlockList::iterator clear_blocks_end; Block *pending_block; bool reserving; bool advancing; @@ -157,10 +158,11 @@ private: void loco_speed_event(unsigned, unsigned, bool); void loco_func_event(unsigned, unsigned, bool); void sensor_event(unsigned, bool); - void turnout_event(unsigned, bool); + void turnout_path_changed(Track &); void halt_event(bool); void block_reserved(const Block &, const Train *); unsigned reserve_more(); + void check_turnout_paths(bool); float get_reserved_distance_until(const Block *, bool) const; float get_real_speed(unsigned) const; unsigned find_speed(float) const;