From 2147c8116249ee1443b369c7580675e6a26fbde3 Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Mon, 6 Oct 2014 20:18:11 +0000
Subject: [PATCH] (svn r26974) [1.4] -Backport from trunk: - Fix: Owner of road
 depot road types were not properly changed upon bankruptcy [FS#6126] (r26955)

---
 docs/landscape.html      | 3 ++-
 docs/landscape_grid.html | 4 ++--
 src/road_cmd.cpp         | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/landscape.html b/docs/landscape.html
index abf01c9d8b..2aa30460ec 100644
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -539,6 +539,7 @@
        </tr>
       </table>
      </li>
+     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
      <li>m5 bits 7 clear: road or level-crossing
       <ul>
        <li>m6 bits 5..3:
@@ -573,7 +574,6 @@
          </tr>
         </table>
        </li>
-       <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
        <li>m5 bit 6 clear: road
         <ul>
          <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
@@ -663,6 +663,7 @@
          </tr>
         </table>
        </li>
+       <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
       </ul>
      </li>
      <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index e2f3c1f977..cd5d3203d7 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -147,11 +147,11 @@ the array so you can quickly see what is used and what is not.
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX <span class="free">OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXX<span class="free">O OOOO</span></td>
+      <td class="bits">XXX<span class="free">O</span> XXXX</td>
     </tr>
     <tr>
       <td>3</td>
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 7931fa965b..8527dc3d7d 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -1763,6 +1763,11 @@ static void ChangeTileOwner_Road(TileIndex tile, Owner old_owner, Owner new_owne
 				Company::Get(new_owner)->infrastructure.road[rt] += 2;
 
 				SetTileOwner(tile, new_owner);
+				for (RoadType rt = ROADTYPE_ROAD; rt < ROADTYPE_END; rt++) {
+					if (GetRoadOwner(tile, rt) == old_owner) {
+						SetRoadOwner(tile, rt, new_owner);
+					}
+				}
 			}
 		}
 		return;