X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.h;h=03b8b66d3e1e929869431c0ec472853d823dbdaf;hb=dda1e6c8716b6ac70d63a3f6ff95474a8b8b7336;hp=c60b8c044ce743549b5b78eb638183e1fcda189a;hpb=b14059de03324aecde3efc649293d98ce5b7aaf2;p=r2c2.git

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index c60b8c0..03b8b66 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -1,34 +1,26 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef LIBR2C2_TRAIN_H_
 #define LIBR2C2_TRAIN_H_
 
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/time/timestamp.h>
 #include "block.h"
-#include "blockiter.h"
+#include "blockallocator.h"
 #include "controller.h"
 #include "trainai.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
-class Route;
 class SpeedQuantizer;
 class Vehicle;
 class VehicleType;
-class Zone;
 
 class Train: public sigc::trackable
 {
 public:
-	class Loader: public Msp::DataFile::BasicLoader<Train>
+	class Loader: public Msp::DataFile::ObjectLoader<Train>
 	{
 	private:
 		Block *prev_block;
@@ -38,11 +30,10 @@ public:
 		Loader(Train &);
 	private:
 		virtual void finish();
-		void block(unsigned);
-		void block_hint(unsigned);
+		void blocks();
 		void name(const std::string &);
 		void quantized_speed();
-		void route(const std::string &);
+		void router();
 		void timetable();
 		void vehicle(ArticleNumber);
 	};
@@ -51,36 +42,17 @@ 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;
 	const VehicleType &loco_type;
 	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;
-	bool reserving;
+	BlockAllocator allocator;
 	bool advancing;
 	Controller *controller;
 	std::list<TrainAI *> ais;
@@ -90,11 +62,9 @@ private:
 	bool reverse;
 	Msp::Time::TimeStamp stop_timeout;
 	unsigned functions;
-	std::list<RouteRef> routes;
-	bool end_of_route;
 
+	BlockIter last_entry_block;
 	Msp::Time::TimeStamp last_entry_time;
-	float travel_dist;
 	bool pure_speed;
 	SpeedQuantizer *speed_quantizer;
 	bool accurate_position;
@@ -110,9 +80,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; }
 
@@ -135,20 +102,25 @@ public:
 
 	void add_ai(TrainAI &);
 	void remove_ai(TrainAI &);
-	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);
+	template<typename T>
+	T *get_ai_of_type() const
+	{
+		for(std::list<TrainAI *>::const_iterator i=ais.begin(); i!=ais.end(); ++i)
+			if(T *ai = dynamic_cast<T *>(*i))
+				return ai;
+		return 0;
+	}
+
+	void place(const BlockIter &);
 	void unplace();
-	bool is_placed() const { return !blocks.empty(); }
+	bool is_placed() const { return !allocator.empty(); }
+	void stop_at(Block *);
 	bool free_block(Block &);
 	void free_noncritical_blocks();
-	int get_entry_to_block(Block &) const;
+	void reserve_more();
+	const BlockAllocator &get_block_allocator() const { return allocator; }
 	float get_reserved_distance() const;
 
 	void tick(const Msp::Time::TimeStamp &, const Msp::Time::TimeDelta &);
@@ -159,18 +131,9 @@ private:
 	void loco_speed_event(unsigned, unsigned, bool);
 	void loco_func_event(unsigned, unsigned, bool);
 	void block_state_changed(Block &, Block::State);
-	void turnout_path_changed(Track &);
 	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
-	void reserve_more();
-	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