X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.h;h=9b228c026a791374f26de248f1a04fab3f8e95a4;hb=e8b19bb2711913226580b93ba127b0628839c10d;hp=25392bd768db8f06493fe414fb6f9e038068cec1;hpb=9ad36841021cdd5c7f14d52e946d8ecdb602cf78;p=r2c2.git

diff --git a/source/libr2c2/train.h b/source/libr2c2/train.h
index 25392bd..9b228c0 100644
--- a/source/libr2c2/train.h
+++ b/source/libr2c2/train.h
@@ -32,11 +32,12 @@ public:
 	private:
 		virtual void finish();
 		void blocks();
+		void function(unsigned, bool);
 		void name(const std::string &);
 		void quantized_speed();
 		void router();
 		void timetable();
-		void vehicle(ArticleNumber);
+		void vehicle(const std::string &);
 	};
 
 	sigc::signal<void, const std::string &> signal_name_changed;
@@ -44,6 +45,7 @@ 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, Block &> signal_rear_advanced;
 	sigc::signal<void, unsigned, Vehicle &> signal_vehicle_added;
 	sigc::signal<void, unsigned, Vehicle &> signal_vehicle_removed;
 
@@ -120,7 +122,10 @@ public:
 	bool is_placed() const { return !allocator.empty(); }
 	void stop_at(Block *);
 	bool is_block_critical(const Block &) const;
-	BlockIter get_first_noncritical_block() const;
+	BlockIter get_last_critical_block() const;
+private:
+	BlockIter check_critical_blocks(const Block *) const;
+public:
 	void refresh_blocks_from(Block &);
 	const BlockAllocator &get_block_allocator() const { return allocator; }
 	float get_reserved_distance() const;
@@ -132,7 +137,7 @@ private:
 	void control_changed(const Controller::Control &);
 	void loco_speed_event(unsigned, unsigned, bool);
 	void loco_func_event(unsigned, unsigned, bool);
-	void sensor_state_changed(Sensor &, Sensor::State);
+	void advanced(Block &, Sensor *);
 	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
 	float get_reserved_distance_until(const Block *) const;