Replace one more stray load function with DataFile::load

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

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index f18ba8d6f49d52a53844045078aa17f5dd766a96..68c57b88e39c102f8d38e5f8b75f00c93fd51afd 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_
 
@@ -27,27 +34,30 @@ private:
        TrafficManager &trfc_mgr;
        unsigned       id;
        unsigned       sensor_id;
+       unsigned       turnout_id;
        std::set<Track *>     tracks;
        std::vector<Endpoint> endpoints;
        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 *> &);
 
        static unsigned next_id;
 };
-typedef std::list<Block *> BlockSeq;
 
 } // namespace Marklin