+ if(cur_route!=next_route && next_route && next_route->get_tracks().count(entry_ep.track))
+ cur_route = next_route;
+ else if(!cur_route->get_tracks().count(entry_ep.track))
+ {
+ // Keep the blocks if we arrived at the end of the route
+ good = last;
+ good_sens = nsens;
+ end_of_route = true;
+ break;
+ }
+ }
+ else if(route && route->get_tracks().count(entry_ep.track))
+ cur_route = route;
+
+ if(!link->reserve(this))
+ {
+ // If we found another train and it's not headed straight for us, we can keep the blocks we got
+ int other_entry = link->get_train()->get_entry_to_block(*link);
+ if(other_entry<0)
+ throw LogicError("Block reservation inconsistency");
+ if(static_cast<unsigned>(entry)!=link->traverse(other_entry))
+ {
+ good = last;
+ good_sens = nsens;
+ }
+ pending_block = link;
+ break;
+ }
+
+ if(link->get_turnout_id())
+ {
+ const Endpoint &track_ep = entry_ep.track->get_type().get_endpoints()[entry_ep.track_ep];
+
+ // Keep the blocks reserved so far, as either us or the other train can diverge
+ good = last;
+ good_sens = nsens;
+
+ // Figure out what path we'd like to take on the turnout
+ int path = -1;
+ if(cur_route)
+ path = cur_route->get_turnout(link->get_turnout_id());
+ if(path<0)
+ path = entry_ep.track->get_active_path();
+ if(!((track_ep.paths>>path)&1))
+ {
+ for(unsigned i=0; track_ep.paths>>i; ++i)
+ if((track_ep.paths>>i)&1)
+ path = i;
+ }
+
+ if(path!=static_cast<int>(entry_ep.track->get_active_path()))
+ {
+ // The turnout is set to wrong path - switch and wait for it
+ link->reserve(0);
+ pending_block = link;
+ entry_ep.track->set_active_path(path);
+ break;
+ }
+ }
+
+ rsv_blocks.push_back(BlockRef(link, entry));
+ last = &rsv_blocks.back();
+ if(last->block->get_sensor_id())
+ {
+ ++nsens;
+ got_more = true;
+ }
+ }
+
+ // Unreserve blocks that were not good
+ while(!rsv_blocks.empty() && last!=good)
+ {
+ last->block->reserve(0);
+ rsv_blocks.erase(--rsv_blocks.end());
+ if(!rsv_blocks.empty())
+ last = &rsv_blocks.back();
+ }
+
+ if(got_more)
+ update_speed();
+
+ return good_sens;
+}
+
+void Train::update_speed()
+{
+ Driver &driver = layout.get_driver();
+
+ unsigned speed;
+ if(!target_speed)
+ {
+ speed = 0;
+ set_status("Stopped");
+ }
+ else
+ {
+ unsigned nsens = 0;
+ for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+ if(i->block->get_sensor_id())
+ ++nsens;
+
+ unsigned slow_speed = find_speed(0.1); // 31.3 km/h
+ if(nsens==0)
+ {
+ speed = 0;
+ pure_speed = false;
+ set_status("Blocked");
+ }
+ else if(nsens==1 && target_speed>slow_speed)
+ {
+ speed = slow_speed;
+ pure_speed = false;
+ set_status("Slow");