X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=7c0f8ac2aff063f1c4bee3558df8119a3cb4cb49;hb=e179208d1c8370f87ce6ec87f649e5e99eb5724f;hp=770a3520289227830b37d40df45ce1d12ca83cc8;hpb=449fb5de95ddb2ac9da4bd72a1c12150505d5549;p=r2c2.git diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h index 770a352..7c0f8ac 100644 --- a/source/libmarklin/block.h +++ b/source/libmarklin/block.h @@ -25,7 +25,7 @@ public: Track *track; unsigned track_ep; Block *link; - unsigned routes; + unsigned paths; Endpoint(Track *, unsigned); }; @@ -47,14 +47,14 @@ public: const std::set &get_tracks() const { return tracks; } const std::vector &get_endpoints() const { return endpoints; } int get_endpoint_by_link(const Block &) const; - int traverse(unsigned, float * =0) const; + unsigned traverse(unsigned, float * =0) const; void check_link(Block &); Block *get_link(unsigned) const; bool reserve(const Train *); const Train *get_train() const { return train; } void print_debug(); private: - void find_routes(Track &, unsigned, unsigned, std::set &); + void find_paths(Track &, unsigned, unsigned, std::set &); static unsigned next_id; };