Remove status from Train and turn it into a TrainAI

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

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index 59aa9dc022365be78823885a210f0431872dc48b..90b2a72dc5ce94e3795d2a3d232d932fed22d484 100644 (file)
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -92,7 +92,6 @@ private:
        unsigned functions;
        std::list<RouteRef> routes;
        bool end_of_route;
-       std::string status;
 
        Msp::Time::TimeStamp last_entry_time;
        float travel_dist;
@@ -128,13 +127,15 @@ public:
        void set_function(unsigned, bool);
        float get_control(const std::string &) const;
        float get_speed() const;
+       float get_quantized_speed() const;
+       unsigned get_speed_step() const { return current_speed_step; }
        bool is_active() const { return active; }
        bool get_function(unsigned) const;
        unsigned get_functions() const { return functions; }
 
        void add_ai(TrainAI &);
        void remove_ai(TrainAI &);
-       TrainAI *get_tagged_ai(const std::string &);
+       TrainAI *get_tagged_ai(const std::string &) const;
        void ai_message(const TrainAI::Message &);
 
        bool set_route(const Route *);
@@ -150,8 +151,6 @@ public:
        int get_entry_to_block(Block &) const;
        float get_reserved_distance() const;
 
-       const std::string &get_status() const { return status; }
-
        void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
 
        void save(std::list<Msp::DataFile::Statement> &) const;
@@ -166,10 +165,6 @@ private:
        void reserve_more();
        void check_turnout_paths(bool);
        float get_reserved_distance_until(const Block *, bool) const;
-       float get_real_speed(unsigned) const;
-       unsigned find_speed_step(float) const;
-       float get_travel_speed() const;
-       void set_status(const std::string &);
        void release_blocks();
        void release_blocks(BlockList::iterator, BlockList::iterator);
        void reverse_blocks(BlockList &) const;