Merge pull request aburch#6 from jamespetts/master

Way constraints fix

Author: vladki77

boden/wege/weg.cc

@@ -950,7 +950,7 @@ void weg_t::info(cbuffer_t & buf, bool is_bridge) const
 				}
 				any_permissive = true;
 				char tmpbuf[30];
-				sprintf(tmpbuf, " Permissive %i-%i", desc->get_waytype(), i);
+				sprintf(tmpbuf, "Permissive %i-%i", desc->get_waytype(), i);
 				buf.append(translator::translate(tmpbuf));
 				buf.append("\n");
 			}

vehicle/simvehicle.cc

@@ -6555,10 +6555,20 @@ sint32 rail_vehicle_t::block_reserver(route_t *route, uint16 start_index, uint16
 
 		bool last_signal_was_track_circuit_block = false;
 
+		if (no_junctions_to_next_signal && reached_end_of_loop && success && last_stop_signal_index < INVALID_INDEX)
+		{
+			const grund_t* gr_signal = welt->lookup(route->at(last_stop_signal_index));
+			signal_t* signal = gr_signal->find<signal_t>();
+			if (signal)
+			{
+				signal->set_no_junctions_to_next_signal(true);
+			}
+		}
+
 		FOR(slist_tpl<grund_t*>, const g, signs)
 		{
 			if(signal_t* const signal = g->find<signal_t>())
-			{
+			{		
 				if(((counter -- > 0 || (pre_signals.empty() && (!starting_at_signal || signs.get_count() == 1)) || (reached_end_of_loop && (early_platform_index == INVALID_INDEX || last_stop_signal_index < early_platform_index))) && (signal->get_desc()->get_working_method() != token_block || starting_at_signal || ((start_index == first_stop_signal_index) && (first_stop_signal_index == last_stop_signal_index))) && ((route->at(route->get_count() - 1) != signal->get_pos()) || signal->get_desc()->get_working_method() == token_block)))
 				{
 					const bool use_no_choose_aspect = choose_route_identical_to_main_route || (signal->get_desc()->is_choose_sign() && !is_choosing && choose_return == 0);