Merge branch 'master' into jgrpp

# Conflicts: # src/lang/english.txt # src/lang/korean.txt
2016-12-09 23:42:54 +00:00
parent 56bba9edcb 4753097c3d
commit 478ff2538e
63 changed files with 1341 additions and 1328 deletions
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -3122,6 +3122,7 @@ static void GetTileDesc_Station(TileIndex tile, TileDesc *td)

 		const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
 		td->rail_speed = rti->max_speed;
+		td->railtype = rti->strings.name;
 	}

 	if (IsAirport(tile)) {