X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.h;h=461a27e583146bde1080e64acbb6384b0c33a3e6;hb=bde934f7d5ba07a9442a305192e10024820d13ed;hp=7c388ad7087801fe5928f69cfa9915da43b05d6b;hpb=d0af7846e05691d65d8021e46c8f81e8ca05199a;p=r2c2.git diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h index 7c388ad..461a27e 100644 --- a/source/libr2c2/train.h +++ b/source/libr2c2/train.h @@ -57,7 +57,6 @@ private: std::vector vehicles; BlockList blocks; BlockList::iterator cur_blocks_end; - BlockList::iterator clear_blocks_end; Block *pending_block; Block *stop_at_block; bool reserving; @@ -110,9 +109,17 @@ public: void add_ai(TrainAI &); void remove_ai(TrainAI &); - TrainAI *get_tagged_ai(const std::string &) const; void ai_message(const TrainAI::Message &); + template + T *get_ai_of_type() const + { + for(std::list::const_iterator i=ais.begin(); i!=ais.end(); ++i) + if(T *ai = dynamic_cast(*i)) + return ai; + return 0; + } + void place(Block &, unsigned); void unplace(); bool is_placed() const { return !blocks.empty(); } @@ -138,7 +145,6 @@ private: public: void reserve_more(); private: - void check_turnout_paths(bool); float get_reserved_distance_until(const Block *, bool) const; void release_blocks(); void release_blocks(BlockList::iterator, BlockList::iterator);