X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicle.cpp;h=6615fb25b768cebf6c05003eb1e52fba5d2efcd2;hb=93c148ff88ba2c8266b44c336ba7ddd948010de7;hp=2ad716600f50a293ae07c1fa47be0e47fdd4268c;hpb=dd05e8ed55a9072daaf18e4c63c3b66e386ba7f4;p=r2c2.git

diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp
index 2ad7166..6615fb2 100644
--- a/source/libr2c2/vehicle.cpp
+++ b/source/libr2c2/vehicle.cpp
@@ -33,6 +33,8 @@ Vehicle::Vehicle(Layout &l, const VehicleType &t):
 		for(unsigned j=0; j<i->axles.size(); ++j)
 			i->axles[j] = &axles[i->type->first_axle+j];
 
+	update_rods();
+
 	layout.add(*this);
 }
 
@@ -104,6 +106,9 @@ void Vehicle::place(const TrackOffsetIter &t, VehiclePlacement::Anchor a)
 {
 	if(!t)
 		throw invalid_argument("Vehicle::place");
+	float gauge_ratio = t->get_type().get_gauge()/type.get_gauge();
+	if(gauge_ratio<0.99 || gauge_ratio>1.01)
+		throw logic_error("Incompatible gauge");
 
 	placement.place(t, a);
 
@@ -173,7 +178,8 @@ void Vehicle::update_position(int sign)
 {
 	OrientedPoint p = placement.get_point();
 	position = p.position;
-	position.z += layout.get_catalogue().get_rail_elevation();
+	// TODO Move the z adjustment to VehiclePlacement
+	position.z += placement.get_position(VehiclePlacement::FRONT_AXLE)->get_type().get_appearance().get_rail_elevation();
 	rotation = p.rotation;
 	tilt = p.tilt;
 
@@ -245,7 +251,7 @@ void Vehicle::propagate_backward()
 
 void Vehicle::check_sensor(const TrackOffsetIter &t, unsigned &sensor, bool release)
 {
-	unsigned s = t->get_sensor_id();
+	unsigned s = t->get_sensor_address();
 	if(s!=sensor)
 	{
 		unsigned old = sensor;
@@ -353,6 +359,14 @@ int Vehicle::get_link_slot(const Object &other) const
 		return -1;
 }
 
+bool Vehicle::collide_ray(const Ray &ray, float *d) const
+{
+	if(is_placed())
+		return Object::collide_ray(ray, d);
+	else
+		return false;
+}
+
 
 Vehicle::Axle::Axle(const VehicleType::Axle &t):
 	type(&t)