Use a single block list in Train

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

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index e55e36e2c40c973bab93fb20bfca0cf1d33622fa..d637cc03b03735d67e59fa3f7aa7f70b5c7c97f4 100644 (file)
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -79,8 +79,8 @@ private:
        int priority;
        const Train *yielding_to;
        std::vector<Vehicle *> vehicles;
-       BlockList cur_blocks;
-       BlockList rsv_blocks;
+       BlockList blocks;
+       BlockList::iterator cur_blocks_end;
        Block *pending_block;
        bool reserving;
        bool advancing;
@@ -141,7 +141,7 @@ public:
        const Route *get_route() const;
        void place(Block &, unsigned);
        void unplace();
-       bool is_placed() const { return !cur_blocks.empty(); }
+       bool is_placed() const { return !blocks.empty(); }
        bool free_block(Block &);
        void free_noncritical_blocks();
        int get_entry_to_block(Block &) const;
@@ -166,8 +166,8 @@ private:
        unsigned find_speed(float) const;
        float get_travel_speed() const;
        void set_status(const std::string &);
-       void release_blocks(BlockList &);
-       void release_blocks(BlockList &, BlockList::iterator, BlockList::iterator);
+       void release_blocks();
+       void release_blocks(BlockList::iterator, BlockList::iterator);
        void reverse_blocks(BlockList &) const;
        bool advance_route(std::list<RouteRef>::iterator &, Track &);
        Route *create_lead_route(Route *, const Route *);