X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.h;h=7c388ad7087801fe5928f69cfa9915da43b05d6b;hb=d0af7846e05691d65d8021e46c8f81e8ca05199a;hp=f8f7bfb51159778549b02afed6de47fa38f98b23;hpb=64340dad429ba4040538fc06b6882aabdb489925;p=r2c2.git

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index f8f7bfb..7c388ad 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -13,11 +13,9 @@
 namespace R2C2 {
 
 class ArticleNumber;
-class Route;
 class SpeedQuantizer;
 class Vehicle;
 class VehicleType;
-class Zone;
 
 class Train: public sigc::trackable
 {
@@ -36,7 +34,7 @@ public:
 		void block_hint(unsigned);
 		void name(const std::string &);
 		void quantized_speed();
-		void route(const std::string &);
+		void router();
 		void timetable();
 		void vehicle(ArticleNumber);
 	};
@@ -45,20 +43,9 @@ public:
 	sigc::signal<void, const std::string &, float> signal_control_changed;
 	sigc::signal<void, unsigned, bool> signal_function_changed;
 	sigc::signal<void, TrainAI &, const TrainAI::Message &> signal_ai_event;
-	sigc::signal<void, const Route *> signal_route_changed;
 	sigc::signal<void, Block &> signal_advanced;
-	sigc::signal<void> signal_arrived;
-	sigc::signal<void, const std::string &> signal_status_changed;
 
 private:
-	struct RouteRef
-	{
-		const Route *route;
-		unsigned diversion;
-
-		RouteRef(const Route *, unsigned = 0);
-	};
-
 	typedef std::list<BlockIter> BlockList;
 
 	Layout &layout;
@@ -66,14 +53,13 @@ private:
 	unsigned address;
 	std::string protocol;
 	std::string name;
-	int priority;
-	const Train *yielding_to;
 	const Train *preceding_train;
 	std::vector<Vehicle *> vehicles;
 	BlockList blocks;
 	BlockList::iterator cur_blocks_end;
 	BlockList::iterator clear_blocks_end;
 	Block *pending_block;
+	Block *stop_at_block;
 	bool reserving;
 	bool advancing;
 	Controller *controller;
@@ -84,8 +70,6 @@ private:
 	bool reverse;
 	Msp::Time::TimeStamp stop_timeout;
 	unsigned functions;
-	std::list<RouteRef> routes;
-	bool end_of_route;
 
 	Msp::Time::TimeStamp last_entry_time;
 	float travel_dist;
@@ -104,9 +88,6 @@ public:
 	const std::string &get_protocol() const { return protocol; }
 	void set_name(const std::string &);
 	const std::string &get_name() const { return name; }
-	void set_priority(int);
-	void yield_to(const Train &);
-	int get_priority() const { return priority; }
 	const Train *get_preceding_train() const { return preceding_train; }
 	Controller &get_controller() const { return *controller; }
 
@@ -132,17 +113,15 @@ public:
 	TrainAI *get_tagged_ai(const std::string &) const;
 	void ai_message(const TrainAI::Message &);
 
-	bool set_route(const Route *);
-	bool go_to(Track &);
-	bool go_to(const Zone &);
-	bool divert(Track &);
-	const Route *get_route() const;
 	void place(Block &, unsigned);
 	void unplace();
 	bool is_placed() const { return !blocks.empty(); }
+	void stop_at(Block *);
 	bool free_block(Block &);
 	void free_noncritical_blocks();
-	int get_entry_to_block(Block &) const;
+	const BlockIter &get_head_block() const;
+	const BlockIter &get_tail_block() const;
+	int get_entry_to_block(const Block &) const;
 	float get_reserved_distance() const;
 
 	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
@@ -156,15 +135,14 @@ private:
 	void turnout_path_changed(Track &);
 	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
+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);
 	void reverse_blocks(BlockList &) const;
-	bool advance_route(std::list<RouteRef>::iterator &, Track &);
-	Route *create_lead_route(Route *, const Route *);
-	bool is_valid_diversion(const Route &, const TrackIter &);
 };
 
 } // namespace R2C2