X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fvehicle.cpp;h=5843c17998363f391025ecda5ba744726dd9fcaf;hb=c0e076401ee76fd9a5a96ff919a8e7b4d058c51b;hp=9d0f3e88dc4203e8b497b02f01e27d6b1ef131a7;hpb=bc9e941447da48905295192289bc09483a678180;p=r2c2.git

diff --git a/source/3d/vehicle.cpp b/source/3d/vehicle.cpp
index 9d0f3e8..5843c17 100644
--- a/source/3d/vehicle.cpp
+++ b/source/3d/vehicle.cpp
@@ -15,9 +15,9 @@ namespace R2C2 {
 
 Vehicle3D::Vehicle3D(Layout3D &l, Vehicle &v):
 	Object3D(l, v),
-	GL::ObjectInstance(*l.get_catalogue().get_vehicle(v.get_type()).get_body_object()),
+	GL::ObjectInstance(*l.get_catalogue().get_3d(v.get_type()).get_body_object()),
 	vehicle(v),
-	type(layout.get_catalogue().get_vehicle(vehicle.get_type()))
+	type(layout.get_catalogue().get_3d(vehicle.get_type()))
 {
 	unsigned n_axles = vehicle.get_type().get_axles().size();
 	for(unsigned i=0; i<n_axles; ++i)
@@ -57,7 +57,7 @@ Vector Vehicle3D::get_node() const
 
 bool Vehicle3D::is_visible() const
 {
-	return vehicle.get_track();
+	return vehicle.is_placed();
 }
 
 void Vehicle3D::moved()
@@ -70,7 +70,7 @@ void Vehicle3D::moved()
 
 void Vehicle3D::render(GL::Renderer &renderer, const GL::Tag &tag) const
 {
-	if(!vehicle.get_track())
+	if(!is_visible())
 		return;
 
 	ObjectInstance::render(renderer, tag);