+ }
+
+ float margin = 10*layout.get_catalogue().get_scale();
+ float min_dist = controller->get_braking_distance()*1.3+margin;
+
+ Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
+
+ TrackIter track(veh.get_track(), veh.get_entry());
+ BlockList::iterator block = blocks.begin();
+ bool in_rsv = false;
+ while(block!=blocks.end() && !(*block)->has_track(*track))
+ {
+ ++block;
+ if(block==cur_blocks_end)
+ in_rsv = true;
+ }
+
+ float dist = veh.get_offset();
+ if(reverse)
+ track.reverse();
+ else
+ dist = track->get_type().get_path_length(track->get_active_path())-dist;
+ dist -= veh.get_type().get_length()/2;
+
+ bool nsens = 0;
+ while(1)
+ {
+ track = track.next();
+
+ if(!(*block)->has_track(*track))
+ {
+ ++block;
+ if(block==cur_blocks_end)
+ in_rsv = true;
+ if(block==blocks.end())
+ return;
+
+ if(dist>min_dist && nsens>0)
+ {
+ release_blocks(block, blocks.end());
+ return;
+ }
+
+ if(in_rsv && (*block)->get_sensor_id())
+ ++nsens;
+ }
+
+ dist += track->get_type().get_path_length(track->get_active_path());
+ }
+}
+
+int Train::get_entry_to_block(Block &block) const
+{
+ for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ if(i->block()==&block)
+ return i->entry();
+ return -1;
+}
+
+float Train::get_reserved_distance() const
+{
+ return get_reserved_distance_until(0, false);
+}
+
+void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
+{
+ if(!active && stop_timeout && t>=stop_timeout)
+ {
+ release_blocks(cur_blocks_end, blocks.end());
+ stop_timeout = Time::TimeStamp();
+ }
+
+ Driver &driver = layout.get_driver();
+
+ if(timetable)
+ timetable->tick(t);
+ controller->tick(dt);
+ float speed = controller->get_speed();
+ unsigned speed_step = find_speed_step(speed);
+
+ if(controller->get_reverse()!=reverse)
+ {
+ reverse = controller->get_reverse();
+ driver.set_loco_reverse(address, reverse);
+
+ release_blocks(cur_blocks_end, blocks.end());
+ reverse_blocks(blocks);
+
+ reserve_more();
+ }
+ if(speed_step!=current_speed_step && !speed_changing && !driver.is_halted() && driver.get_power())
+ {
+ speed_changing = true;
+ driver.set_loco_speed(address, speed_step);
+
+ pure_speed = false;
+
+ if(speed_step)
+ set_status(format("Traveling %d kmh", get_travel_speed()));
+ else
+ set_status("Waiting");
+ }
+
+ if(speed)
+ {
+ if(!active)
+ set_active(true);
+
+ Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
+ Track *track = vehicle.get_track();
+
+ bool ok = false;
+ for(BlockList::const_iterator i=blocks.begin(); (!ok && i!=cur_blocks_end); ++i)
+ ok = (*i)->has_track(*track);
+
+ float d;
+ if(real_speed.size()>1)
+ d = get_real_speed(current_speed_step)*(dt/Time::sec);
+ else
+ d = speed*(dt/Time::sec);
+ if(ok)
+ {
+ SetFlag setf(advancing);
+ vehicle.advance(reverse ? -d : d);
+ }
+ else if(accurate_position)
+ {
+ overshoot_dist += d;
+ if(overshoot_dist>40*layout.get_catalogue().get_scale())
+ {
+ layout.emergency(name+" has not arrived at sensor");
+ accurate_position = false;
+ }
+ }
+ }
+ else if(end_of_route && cur_blocks_end==blocks.end())
+ {
+ set_active(false);
+ signal_arrived.emit();
+ set_route(0);
+ }
+
+ if(!blocks.empty() && !blocks.front()->get_sensor_id())
+ {
+ float dist = get_reserved_distance_until(&*blocks.front(), true);
+
+ if(dist>10*layout.get_catalogue().get_scale())
+ {
+ blocks.front()->reserve(0);
+ blocks.pop_front();
+ }
+ }
+}
+
+void Train::save(list<DataFile::Statement> &st) const
+{
+ st.push_back((DataFile::Statement("name"), name));
+
+ st.push_back((DataFile::Statement("priority"), priority));
+
+ for(vector<Vehicle *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+ if(i!=vehicles.begin())
+ st.push_back((DataFile::Statement("vehicle"), (*i)->get_type().get_article_number()));
+
+ for(unsigned i=0; i<real_speed.size(); ++i)
+ if(real_speed[i].weight)
+ st.push_back((DataFile::Statement("real_speed"), i, real_speed[i].speed, real_speed[i].weight));
+
+ if(!blocks.empty() && cur_blocks_end!=blocks.begin())
+ {
+ BlockList blks(blocks.begin(), BlockList::const_iterator(cur_blocks_end));
+ if(reverse)
+ reverse_blocks(blks);
+
+ BlockIter prev = blks.front().flip();
+ st.push_back((DataFile::Statement("block_hint"), prev->get_id()));