X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=8087745f3dd29f03b9d3b3bfb4eec75859c246e8;hb=4d33c389881ebdf0b3926343d53e7d1ece654e20;hp=866454164ee1592b9cb794f8413cc9509c3571a5;hpb=a4566a4a23ff676f11a90615e8e468ef50107946;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 8664541..8087745 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -71,6 +71,7 @@ private:
 	const LocoType &loco_type;
 	unsigned address;
 	std::string name;
+	int priority;
 	std::vector<Vehicle *> vehicles;
 	std::list<BlockRef> cur_blocks;
 	std::list<BlockRef> rsv_blocks;
@@ -104,6 +105,8 @@ public:
 	unsigned get_address() const { return address; }
 	void set_name(const std::string &);
 	const std::string &get_name() const { return name; }
+	void set_priority(int);
+	int get_priority() const { return priority; }
 	ControlModel &get_control() const { return *control; }
 
 	Vehicle &get_vehicle(unsigned);
@@ -136,6 +139,7 @@ private:
 	void loco_func_event(unsigned, unsigned, bool);
 	void sensor_event(unsigned, bool);
 	void turnout_event(unsigned, bool);
+	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
 	unsigned reserve_more();
 	float get_real_speed(unsigned) const;