(*i)->message(msg);
}
-void Train::place(Block &block, unsigned entry)
+void Train::place(const BlockIter &block)
{
+ if(!block)
+ throw invalid_argument("Train::place");
if(controller->get_speed())
throw logic_error("moving");
set_active(false);
accurate_position = false;
- allocator.start_from(block, entry);
+ allocator.start_from(block);
if(reverse)
- {
- TrackIter track = BlockIter(&block, entry).reverse().track_iter();
- vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_BUFFER);
- }
+ vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER);
else
- {
- const Block::Endpoint &bep = block.get_endpoint(entry);
- vehicles.back()->place(*bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
- }
+ vehicles.back()->place(block.track_iter(), 0, Vehicle::BACK_BUFFER);
}
void Train::unplace()
Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
- TrackIter track(veh.get_track(), veh.get_entry());
+ TrackIter track = veh.get_track_iter();
BlockIter block = allocator.first();
const BlockIter &last_cur = allocator.last_current();
const BlockIter &last = allocator.last();
if(reverse)
{
track = track.flip();
- vehicles.back()->place(*track, track.entry(), 0, Vehicle::BACK_AXLE);
+ vehicles.back()->place(track, 0, Vehicle::BACK_AXLE);
}
else
- vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_AXLE);
+ vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE);
}
if(i==last_cur)
Vehicle &veh = *(reverse!=back ? vehicles.back() : vehicles.front());
const VehicleType &vtype = veh.get_type();
- TrackIter track(veh.get_track(), veh.get_entry());
+ TrackIter track = veh.get_track_iter();
if(!track) // XXX Probably unnecessary
return 0;
{
TrackIter track = obj.allocator.first().track_iter();
float offset = 2*obj.layout.get_catalogue().get_scale();
- obj.vehicles.back()->place(*track, track.entry(), offset, Vehicle::BACK_BUFFER);
+ obj.vehicles.back()->place(track, offset, Vehicle::BACK_BUFFER);
}
}