cpp/openttd-patchpack/source Changeset - r17361:f6bd0f7fe25f

Changeset - r17361:f6bd0f7fe25f

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 14 years ago 2011-02-20 15:19:16
frosch@openttd.org

(svn r22117) -Fix [FS#4523-ish]: CanRemoveRoadWithStop() failed for _current_company = OWNER_TOWN, and for OWNER_NONE-owned road.

1 file changed with 14 insertions and 9 deletions:

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -3452,16 +3452,21 @@ static bool CanRemoveRoadWithStop(TileIn @@
 	/* Yeah... water can always remove stops, right? */
 	if (_current_company == OWNER_WATER) return true;
 	Owner road_owner = _current_company;
 	Owner tram_owner = _current_company;
 	RoadTypes rts = GetRoadTypes(tile);
 	if (HasBit(rts, ROADTYPE_ROAD)) road_owner = GetRoadOwner(tile, ROADTYPE_ROAD);
 	if (HasBit(rts, ROADTYPE_TRAM)) tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
 	if ((road_owner != OWNER_TOWN && CheckOwnership(road_owner).Failed()) || CheckOwnership(tram_owner).Failed()) return false;
 	return road_owner != OWNER_TOWN || CheckAllowRemoveRoad(tile, GetAnyRoadBits(tile, ROADTYPE_ROAD), OWNER_TOWN, ROADTYPE_ROAD, flags).Succeeded();
 	if (HasBit(rts, ROADTYPE_TRAM)) {
 		Owner tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
 		if (tram_owner != OWNER_NONE && CheckOwnership(tram_owner).Failed()) return false;
+	}
 	if (HasBit(rts, ROADTYPE_ROAD)) {
 		Owner road_owner = GetRoadOwner(tile, ROADTYPE_ROAD);
 		if (road_owner != OWNER_TOWN) {
 			if (road_owner != OWNER_NONE && CheckOwnership(road_owner).Failed()) return false;
 		} else {
 			if (CheckAllowRemoveRoad(tile, GetAnyRoadBits(tile, ROADTYPE_ROAD), OWNER_TOWN, ROADTYPE_ROAD, flags).Failed()) return false;
+		}
+	}
 	return true;
+}
 CommandCost ClearTile_Station(TileIndex tile, DoCommandFlag flags)

0 comments (0 inline, 0 general)