Change terminology to better distinguish routes on the layout from paths across track...

[r2c2.git] / source / libmarklin / block.h

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index 076637240a21835c2579a269ef1fa05aba0503ab..64f02e50b7babe2242de6dd9d023b0e1075862f9 100644 (file)
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef MARKLIN_3D_BLOCK_H_
 #define MARKLIN_3D_BLOCK_H_
 
@@ -15,37 +22,39 @@ class Block
 public:
        struct Endpoint
        {
-               Track    *track;
+               Track *track;
                unsigned track_ep;
-               Block    *link;
-               unsigned routes;
+               Block *link;
+               unsigned paths;
 
                Endpoint(Track *, unsigned);
        };
 
 private:
        TrafficManager &trfc_mgr;
-       unsigned       id;
-       unsigned       sensor_id;
-       std::set<Track *>     tracks;
+       unsigned id;
+       unsigned sensor_id;
+       unsigned turnout_id;
+       std::set<Track *> tracks;
        std::vector<Endpoint> endpoints;
-       const Train    *train;
+       const Train *train;
 
 public:
        Block(TrafficManager &, Track &);
 
        unsigned get_sensor_id() const { return sensor_id; }
+       unsigned get_turnout_id() const { return turnout_id; }
        const std::set<Track *> &get_tracks() const { return tracks; }
        const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
        int get_endpoint_by_link(const Block &) const;
-       int traverse(unsigned) const;
+       int 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<Track *> &);
+       void find_paths(Track &, unsigned, unsigned, std::set<Track *> &);
 
        static unsigned next_id;
 };