dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
This commit is contained in:
Jonathan G Rennison
2016-12-09 23:42:54 +00:00
parent 56bba9edcb 4753097c3d
commit 478ff2538e
63 changed files with 1341 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/rail_cmd.cpp
View File

@@ -2935,8 +2935,8 @@ static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
{
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
td->rail_speed = rti->max_speed;
td->railtype = rti->strings.name;
td->owner[0] = GetTileOwner(tile);
SetDParamX(td->dparam, 0, rti->strings.name);
switch (GetRailTileType(tile)) {
case RAIL_TILE_NORMAL:
td->str = STR_LAI_RAIL_DESCRIPTION_TRACK;
@@ -3022,7 +3022,6 @@ static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
if (IsRestrictedSignal(tile)) {
SetDParamX(td->dparam, 0, td->str);
SetDParamX(td->dparam, 1, rti->strings.name);
td->str = STR_LAI_RAIL_DESCRIPTION_RESTRICTED_SIGNAL;
}
break;