X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.h;h=3aaf6b14137cf8401489c39918fbba135107a011;hb=b5e23ed067e75f17419dc04be872d2162eac01e9;hp=c0eb52e850006cd4ca48f41f1ad35dd77da227f3;hpb=9f4f169affcedcf249e935f93e0a15ed60232f6a;p=r2c2.git

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index c0eb52e..3aaf6b1 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -43,6 +43,8 @@ public:
 	sigc::signal<void, unsigned, bool> signal_function_changed;
 	sigc::signal<void, TrainAI &, const TrainAI::Message &> signal_ai_event;
 	sigc::signal<void, Block &> signal_advanced;
+	sigc::signal<void, unsigned, Vehicle &> signal_vehicle_added;
+	sigc::signal<void, unsigned, Vehicle &> signal_vehicle_removed;
 
 private:
 	Layout &layout;
@@ -56,7 +58,6 @@ private:
 	bool advancing;
 	Controller *controller;
 	std::list<TrainAI *> ais;
-	bool active;
 	unsigned current_speed_step;
 	bool speed_changing;
 	bool reverse;
@@ -90,13 +91,11 @@ public:
 	const Vehicle &get_vehicle(unsigned) const;
 
 	void set_control(const std::string &, float);
-	void set_active(bool);
 	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; }
 
@@ -117,9 +116,9 @@ public:
 	void unplace();
 	bool is_placed() const { return !allocator.empty(); }
 	void stop_at(Block *);
-	bool free_block(Block &);
-	void free_noncritical_blocks();
-	void reserve_more();
+	bool is_block_critical(const Block &) const;
+	BlockIter get_first_noncritical_block() const;
+	void refresh_blocks_from(Block &);
 	const BlockAllocator &get_block_allocator() const { return allocator; }
 	float get_reserved_distance() const;