Refer to things in the driver with abstract ids instead of addresses

[r2c2.git] / source / libr2c2 / train.h

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index 3aaf6b14137cf8401489c39918fbba135107a011..16e67a43986776890b17734b54c9c15f91461478 100644 (file)
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -51,6 +51,7 @@ private:
        const VehicleType &loco_type;
        unsigned address;
        std::string protocol;
+       unsigned loco_id;
        std::string name;
        const Train *preceding_train;
        std::vector<Vehicle *> vehicles;
@@ -112,7 +113,7 @@ public:
                return 0;
        }
 
-       void place(const BlockIter &);
+       bool place(const BlockIter &);
        void unplace();
        bool is_placed() const { return !allocator.empty(); }
        void stop_at(Block *);