X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=b1664633bc75e06dbb13fbcb92b1fadcea8945f5;hb=26a8dbeae14c685c6aef1aad3aa75c6f1a75e458;hp=07461b80a9558ecc4000c176bf73565e4c6d922b;hpb=d051af7264ee62d03473f1929414e262e918c30a;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index 07461b8..b166463 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -530,14 +530,14 @@ float Train::get_reserved_distance_until(const Block *until_block) const
 	if(reverse)
 		track = track.reverse();
 	else
-		result = track->get_type().get_path_length(track->get_active_path())-result;
+		result = track->get_path_length()-result;
 	result -= veh.get_type().get_length()/2;
 
 	BlockIter block = track.block_iter();
 
 	// Count remaining distance in the vehicle's current block
 	for(track=track.next(); &track->get_block()==&*block; track=track.next())
-		result += track->get_type().get_path_length(track->get_active_path());
+		result += track->get_path_length();
 
 	const BlockIter &last = allocator.last();
 	if(&*block==&*last)
@@ -602,7 +602,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);