X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=78137b8703ddfc7162ec173f83046ff31bfe877b;hb=9cb5f9ef3c0eaac499ef5d045c513116d6809e56;hp=bb82fe4c34090cf22b53f90cda41aa74478dcc01;hpb=73e4a36bbf828e07b83a779b696875e1f80045cc;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index bb82fe4..78137b8 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -14,6 +14,7 @@
 #include "route.h"
 #include "simplecontroller.h"
 #include "speedquantizer.h"
+#include "timetable.h"
 #include "trackcircuit.h"
 #include "trackiter.h"
 #include "tracktype.h"
@@ -161,6 +162,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;
@@ -345,7 +358,8 @@ void Train::tick(const Time::TimeDelta &dt)
 		Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
 
 		float d = speed*(dt/Time::sec);
-		if(allocator.is_block_current(vehicle.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE)->get_block()))
+		Block &block = vehicle.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE)->get_block();
+		if(allocator.is_block_current(block))
 		{
 			SetFlag setf(advancing);
 			vehicle.advance(reverse ? -d : d);
@@ -355,7 +369,7 @@ void Train::tick(const Time::TimeDelta &dt)
 			overshoot_dist += d;
 			if(overshoot_dist>40*layout.get_catalogue().get_scale())
 			{
-				layout.emergency(name+" has not arrived at sensor");
+				layout.emergency(&block, name+" has not arrived at sensor");
 				accurate_position = false;
 			}
 		}
@@ -396,6 +410,12 @@ void Train::save(list<DataFile::Statement> &st) const
 			router->save(ss.sub);
 			st.push_back(ss);
 		}
+		else if(Timetable *timetable = dynamic_cast<Timetable *>(*i))
+		{
+			DataFile::Statement ss("timetable");
+			timetable->save(ss.sub);
+			st.push_back(ss);
+		}
 	}
 }
 
@@ -468,8 +488,11 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 
 		last_entry_block = allocator.iter_for(*block);
 		travel_time = Time::zero;
-		pure_speed = true;
-		accurate_position = true;
+		if(!layout.get_driver().is_halted())
+		{
+			pure_speed = true;
+			accurate_position = true;
+		}
 		overshoot_dist = 0;
 
 		if(!advancing && vehicles.front()->is_placed())
@@ -565,6 +588,7 @@ Train::Loader::Loader(Train &t):
 	add("name",        &Loader::name);
 	add("quantized_speed",  &Loader::quantized_speed);
 	add("router",      &Loader::router);
+	add("timetable",   &Loader::timetable);
 	add("vehicle",     &Loader::vehicle);
 }
 
@@ -600,6 +624,12 @@ void Train::Loader::router()
 	load_sub(*rtr);
 }
 
+void Train::Loader::timetable()
+{
+	Timetable *ttbl = new Timetable(obj);
+	load_sub(*ttbl, obj.layout);
+}
+
 void Train::Loader::vehicle(ArticleNumber art_nr)
 {
 	const VehicleType &vtype = obj.layout.get_catalogue().get<VehicleType>(art_nr);