FIX: (poppo) a chosesignal after a presignal could lead to unsecessful route searches if the directions differed between those signals.

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11761 8aca7d54-2c30-db11-9de9-000461428c89

Author: prissi

Simutrans.sln

@@ -21,7 +21,6 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{0621B295-BEB7-4767-82F1-F27995610323}.Debug|x64.ActiveCfg = Debug|x64
-		{0621B295-BEB7-4767-82F1-F27995610323}.Debug|x64.Build.0 = Debug|x64
 		{0621B295-BEB7-4767-82F1-F27995610323}.Debug|x86.ActiveCfg = Debug|Win32
 		{0621B295-BEB7-4767-82F1-F27995610323}.Debug|x86.Build.0 = Debug|Win32
 		{0621B295-BEB7-4767-82F1-F27995610323}.Release|x64.ActiveCfg = Release|x64
@@ -32,6 +31,7 @@ Global
 		{0621B295-BEB7-4767-82F1-F27995610323}.Stable|x86.ActiveCfg = Stable|Win32
 		{0621B295-BEB7-4767-82F1-F27995610323}.Stable|x86.Build.0 = Stable|Win32
 		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Debug|x64.ActiveCfg = Debug|x64
+		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Debug|x64.Build.0 = Debug|x64
 		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Debug|x86.ActiveCfg = Debug|Win32
 		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Release|x64.ActiveCfg = Release|x64
 		{E74757E8-C2FD-44AD-87BD-3D55F4709484}.Release|x64.Build.0 = Release|x64

simutrans/history.txt

@@ -5,7 +5,7 @@
 	FIX: could built powerlines under bridges by just building a zero length power bridge starting under a bridge
 	ADD: New simple tool 43 to highlight single ribi ways
 	CHG: Pause tool unpauses server waiting for clients
-	FIX: new city buildings were built when exceeded 2x1 size (only renovated)
+	FIX: no new city buildings were built when exceeded 2x1 size (only renovated)
 	FIX: Missing collision check for water factories
 	FIX: Crash when screenshotting in-game window with non-0 position
 	FIX: Graphical glitch when dragging the forest tool across slopes if pakset does not have double grounds

src/simutrans/vehicle/rail_vehicle.cc

@@ -435,7 +435,7 @@ bool rail_vehicle_t::is_choose_signal_clear(signal_t *sig, const route_t::index_
 
 		// now we are in a step and can use the route search array
 		route_t target_rt;
-		const int richtung = ribi_type(get_pos(), pos_next); // to avoid confusion at diagonals
+		const int richtung = ribi_type(cnv->get_route()->at(start_block), cnv->get_route()->at(start_block + 1)); // to avoid confusion at diagonals
 		if(  !target_rt.find_route( welt, cnv->get_route()->at(start_block), this, speed_to_kmh(cnv->get_min_top_speed()), richtung, welt->get_settings().get_max_choose_route_steps() )  ) {
 			// nothing empty or not route with less than get_max_choose_route_steps() tiles
 			target_halt = halthandle_t();