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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.gitignore
#	src/network/network_server.cpp
#	src/vehicle_gui.cpp
This commit is contained in:
Jonathan G Rennison
2020-07-12 12:26:17 +01:00
parent 152cba7156 00eccbe298
commit 7467051331
38 changed files with 66 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/road_cmd.cpp
View File

@@ -2612,7 +2612,8 @@ CommandCost CmdConvertRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
}
if (rtt == RTT_ROAD && owner == OWNER_TOWN) {
error.MakeError(STR_ERROR_INCOMPATIBLE_ROAD);
error.MakeError(STR_ERROR_OWNED_BY);
GetNameOfOwner(OWNER_TOWN, tile);
continue;
}
}
@@ -2669,7 +2670,8 @@ CommandCost CmdConvertRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
}
if (rtt == RTT_ROAD && owner == OWNER_TOWN) {
error.MakeError(STR_ERROR_INCOMPATIBLE_ROAD);
error.MakeError(STR_ERROR_OWNED_BY);
GetNameOfOwner(OWNER_TOWN, tile);
continue;
}
}