X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.h;h=65caa3f9fb245cf4c2ed47e8d71b214f03413e40;hb=e6b7f8c4dd12199c3c5c0bec555fa73c87079729;hp=e749a8336a09de542d0b6f0d3815b0f9437d121d;hpb=39566dc89cdadf4f6e701a14b5d9049f22b591fb;p=r2c2.git

diff --git a/source/libmarklin/train.h b/source/libmarklin/train.h
index e749a83..65caa3f 100644
--- a/source/libmarklin/train.h
+++ b/source/libmarklin/train.h
@@ -26,6 +26,8 @@ public:
 	{
 	public:
 		Loader(Train &);
+	private:
+		void real_speed(unsigned, float, float);
 	};
 
 	sigc::signal<void, const std::string &> signal_name_changed;
@@ -41,6 +43,15 @@ private:
 		BlockRef(Block *s, unsigned e): block(s), entry(e) { }
 	};
 
+	struct RealSpeed
+	{
+		float speed;
+		float weight;
+
+		RealSpeed();
+		void add(float, float);
+	};
+
 	TrafficManager &trfc_mgr;
 	std::string name;
 	Locomotive &loco;
@@ -54,8 +65,7 @@ private:
 	float travel_dist;
 	unsigned travel_speed;
 	bool pure_speed;
-	float speed_scale;
-	float speed_scale_weight;
+	std::vector<RealSpeed> real_speed;
 
 	Track *cur_track;
 	unsigned cur_track_ep;
@@ -84,6 +94,8 @@ private:
 	void turnout_route_changed(unsigned, Turnout *);
 	unsigned reserve_more();
 	void update_speed();
+	float get_real_speed(unsigned) const;
+	unsigned find_speed(float) const;
 	void set_status(const std::string &);
 	void set_position(const Block::Endpoint &);
 	void release_reserved_blocks();