X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=858cbbc9e8c8d093971af814a3acb049717ffc37;hb=b3f8467442aac111e9a316db0dda67d37ae240b8;hp=b670d4137fc303df68b2e84ade2cc710d5a9c11a;hpb=6eba064c477836843a2647d777e95823a96dda43;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index b670d41..858cbbc 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -5,13 +5,11 @@
 #include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
-#include "aicontrol.h"
 #include "beamgate.h"
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
-#include "route.h"
 #include "simplecontroller.h"
 #include "speedquantizer.h"
 #include "timetable.h"
@@ -22,7 +20,6 @@
 #include "trainrouter.h"
 #include "vehicle.h"
 #include "vehicletype.h"
-#include "zone.h"
 
 using namespace std;
 using namespace Msp;
@@ -301,12 +298,9 @@ void Train::tick(const Time::TimeDelta &dt)
 {
 	if(stop_timeout)
 	{
-		stop_timeout -= dt;
+		stop_timeout = max(stop_timeout-dt, Time::zero);
 		if(stop_timeout<=Time::zero)
-		{
 			allocator.set_active(false);
-			stop_timeout = Time::TimeDelta();
-		}
 	}
 
 	travel_time += dt;
@@ -385,9 +379,10 @@ void Train::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("name"), name));
 
+	const Catalogue &cat = layout.get_catalogue();
 	for(vector<Vehicle *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		if(i!=vehicles.begin())
-			st.push_back((DataFile::Statement("vehicle"), (*i)->get_type().get_article_number()));
+			st.push_back((DataFile::Statement("vehicle"), cat.get_name(&(*i)->get_type())));
 
 	if(speed_quantizer)
 	{
@@ -623,9 +618,9 @@ void Train::Loader::timetable()
 	load_sub(*ttbl, obj.layout);
 }
 
-void Train::Loader::vehicle(ArticleNumber art_nr)
+void Train::Loader::vehicle(const string &n)
 {
-	const VehicleType &vtype = obj.layout.get_catalogue().get<VehicleType>(art_nr);
+	const VehicleType &vtype = obj.layout.get_catalogue().get<VehicleType>(n);
 	Vehicle *veh = new Vehicle(obj.layout, vtype);
 	obj.vehicles.back()->attach_back(*veh);
 	obj.vehicles.push_back(veh);