X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrain.cpp;h=845232fa4d9cf442fc5dddc692c5873291c35302;hb=9eb22a66345301631994cf24a21af9375d07a172;hp=7e4a6904610a7b51ee19940e7f4d9cc1812f95aa;hpb=a5e1363ceac1ab552849640c9021fcda362c4416;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 7e4a690..845232f 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -58,7 +58,7 @@ Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 
 	layout.add_train(*this);
 
-	layout.get_driver().add_loco(address, protocol, loco_type);
+	loco_id = layout.get_driver().add_loco(address, protocol, loco_type);
 	layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event));
 	layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event));
 
@@ -140,7 +140,7 @@ void Train::set_function(unsigned func, bool state)
 {
 	if(!loco_type.get_functions().count(func))
 		throw invalid_argument("Train::set_function");
-	layout.get_driver().set_loco_function(address, func, state);
+	layout.get_driver().set_loco_function(loco_id, func, state);
 }
 
 float Train::get_control(const string &ctrl) const
@@ -161,6 +161,18 @@ float Train::get_quantized_speed() const
 		return controller->get_speed();
 }
 
+float Train::get_maximum_speed() const
+{
+	float ms = 0;
+	for(vector<Vehicle *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+	{
+		float vms = (*i)->get_type().get_maximum_speed();
+		if(ms<=0 || (vms>0 && vms<ms))
+			ms = vms;
+	}
+	return ms;
+}
+
 bool Train::get_function(unsigned func) const
 {
 	return (functions>>func)&1;
@@ -255,7 +267,7 @@ BlockIter Train::get_first_noncritical_block() const
 
 		dist += i->get_path_length(i.entry());
 
-		if(i->get_sensor_id())
+		if(i->get_sensor_address())
 			sensor_seen = true;
 	}
 
@@ -317,7 +329,7 @@ void Train::tick(const Time::TimeDelta &dt)
 		bool r = reverse;
 		if(loco_type.get_swap_direction())
 			r = !r;
-		driver.set_loco_reverse(address, r);
+		driver.set_loco_reverse(loco_id, r);
 
 		allocator.reverse();
 		last_entry_block = BlockIter();
@@ -329,7 +341,7 @@ void Train::tick(const Time::TimeDelta &dt)
 		if(speed_step!=current_speed_step && !speed_changing && !driver.is_halted() && driver.get_power())
 		{
 			speed_changing = true;
-			driver.set_loco_speed(address, speed_step);
+			driver.set_loco_speed(loco_id, speed_step);
 
 			pure_speed = false;
 		}
@@ -404,24 +416,24 @@ void Train::control_changed(const Controller::Control &ctrl)
 	signal_control_changed.emit(ctrl.name, ctrl.value);
 }
 
-void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev)
+void Train::loco_speed_event(unsigned id, unsigned speed, bool rev)
 {
-	if(addr==address)
+	if(id==loco_id)
 	{
 		current_speed_step = speed;
 		bool r = reverse;
 		if(loco_type.get_swap_direction())
 			r = !r;
 		if(rev!=r)
-			layout.get_driver().set_loco_reverse(address, r);
+			layout.get_driver().set_loco_reverse(loco_id, r);
 		speed_changing = false;
 		pure_speed = false;
 	}
 }
 
-void Train::loco_func_event(unsigned addr, unsigned func, bool state)
+void Train::loco_func_event(unsigned id, unsigned func, bool state)
 {
-	if(addr==address)
+	if(id==loco_id)
 	{
 		if(state)
 			functions |= 1<<func;
@@ -444,7 +456,7 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 	if(last_entry_block && &*last_entry_block!=block)
 	{
 		for(BlockIter i=last_entry_block.next(); (i && &*i!=block); i=i.next())
-			if(i->get_train()!=this || i->get_sensor_id())
+			if(i->get_train()!=this || i->get_sensor_address())
 				return;
 	}
 
@@ -602,7 +614,7 @@ void Train::Loader::router()
 
 void Train::Loader::vehicle(ArticleNumber art_nr)
 {
-	const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(art_nr);
+	const VehicleType &vtype = obj.layout.get_catalogue().get<VehicleType>(art_nr);
 	Vehicle *veh = new Vehicle(obj.layout, vtype);
 	obj.vehicles.back()->attach_back(*veh);
 	obj.vehicles.push_back(veh);