X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=a13c422a9d8c2d35f989d2704e11447152d908f5;hb=3fce1269879f4b4d676f249f91efd69286a606fd;hp=87fd4a5c839672db096ee79f87b89f7ed886c986;hpb=9b536a7197c424c3fa3809063c56da324b56dab2;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index 87fd4a5..a13c422 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -75,6 +75,7 @@ private:
 	Layout &layout;
 	const VehicleType &loco_type;
 	unsigned address;
+	std::string protocol;
 	std::string name;
 	int priority;
 	const Train *yielding_to;
@@ -88,7 +89,7 @@ private:
 	Controller *controller;
 	Timetable *timetable;
 	bool active;
-	unsigned current_speed;
+	unsigned current_speed_step;
 	bool speed_changing;
 	bool reverse;
 	Msp::Time::TimeStamp stop_timeout;
@@ -105,12 +106,13 @@ private:
 	float overshoot_dist;
 
 public:
-	Train(Layout &, const VehicleType &, unsigned);
+	Train(Layout &, const VehicleType &, unsigned, const std::string &);
 	~Train();
 
 	Layout &get_layout() const { return layout; }
 	const VehicleType &get_locomotive_type() const { return loco_type; }
 	unsigned get_address() const { return address; }
+	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);
@@ -161,11 +163,11 @@ private:
 	void turnout_path_changed(Track &);
 	void halt_event(bool);
 	void block_reserved(const Block &, const Train *);
-	unsigned reserve_more();
+	void reserve_more();
 	void check_turnout_paths(bool);
 	float get_reserved_distance_until(const Block *, bool) const;
 	float get_real_speed(unsigned) const;
-	unsigned find_speed(float) const;
+	unsigned find_speed_step(float) const;
 	float get_travel_speed() const;
 	void set_status(const std::string &);
 	void release_blocks();