X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicle.cpp;h=099644a1301ca8360101d894fec8c9d5c74a4fc3;hb=73e4a36bbf828e07b83a779b696875e1f80045cc;hp=79e3cbef9370f57ce0eaaf4c620e90cd4f72daae;hpb=7aa4925ccb632c1a2289335bccd4862e46e10781;p=r2c2.git diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp index 79e3cbe..099644a 100644 --- a/source/libr2c2/vehicle.cpp +++ b/source/libr2c2/vehicle.cpp @@ -247,7 +247,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; @@ -355,6 +355,14 @@ int Vehicle::get_link_slot(const Object &other) const return -1; } +bool Vehicle::collide_ray(const Ray &ray) const +{ + if(is_placed()) + return Object::collide_ray(ray); + else + return false; +} + Vehicle::Axle::Axle(const VehicleType::Axle &t): type(&t)