From c7e391da93e85ded007493711951e2263cfe39d6 Mon Sep 17 00:00:00 2001
From: TrevorShelton <54145769+TrevorShelton@users.noreply.github.com>
Date: Sun, 28 Jun 2020 01:55:57 -0700
Subject: [PATCH] Change #8162: Conversion of Town Road, Impr. Error

This changes the error when you attempt to convert a road owned by a town to another road, specifying that it's owned by the town rather than simply being incompatible. As the original poster of the issue pointed out, these seemed to be the only occurences of the incompatible road string, so now it's unused, but they would be left untouched in case of future use or since changing it to a different error would do the work of removing it then. If requested, it likely wouldn't be too difficult to remove the string entirely.
---
 src/road_cmd.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 29d7f69bd7..b8aee88d60 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -2399,7 +2399,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;
 				}
 			}
@@ -2445,7 +2446,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;
 				}
 			}