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

Fix crash in GetTileDesc_TunnelBridge on non-road bridges

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-07-18 17:46:22 +01:00
parent 7573260235
commit 8a01fba216
1 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/tunnelbridge_cmd.cpp
View File

@@ -2190,35 +2190,43 @@ static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td)
} }
td->owner[0] = GetTileOwner(tile); td->owner[0] = GetTileOwner(tile);
Owner road_owner = INVALID_OWNER; if (tt == TRANSPORT_ROAD) {
Owner tram_owner = INVALID_OWNER; Owner road_owner = INVALID_OWNER;
RoadType road_rt = GetRoadTypeRoad(tile); Owner tram_owner = INVALID_OWNER;
RoadType tram_rt = GetRoadTypeTram(tile); RoadType road_rt = GetRoadTypeRoad(tile);
if (road_rt != INVALID_ROADTYPE) { RoadType tram_rt = GetRoadTypeTram(tile);
const RoadTypeInfo *rti = GetRoadTypeInfo(road_rt); if (road_rt != INVALID_ROADTYPE) {
td->roadtype = rti->strings.name; const RoadTypeInfo *rti = GetRoadTypeInfo(road_rt);
td->road_speed = rti->max_speed / 2; td->roadtype = rti->strings.name;
road_owner = GetRoadOwner(tile, RTT_ROAD); td->road_speed = rti->max_speed / 2;
} road_owner = GetRoadOwner(tile, RTT_ROAD);
if (tram_rt != INVALID_ROADTYPE) {
const RoadTypeInfo *rti = GetRoadTypeInfo(tram_rt);
td->tramtype = rti->strings.name;
td->tram_speed = rti->max_speed / 2;
tram_owner = GetRoadOwner(tile, RTT_TRAM);
}
/* Is there a mix of owners? */
if ((tram_owner != INVALID_OWNER && tram_owner != td->owner[0]) ||
(road_owner != INVALID_OWNER && road_owner != td->owner[0])) {
uint i = 1;
if (road_owner != INVALID_OWNER) {
td->owner_type[i] = STR_LAND_AREA_INFORMATION_ROAD_OWNER;
td->owner[i] = road_owner;
i++;
} }
if (tram_owner != INVALID_OWNER) { if (tram_rt != INVALID_ROADTYPE) {
td->owner_type[i] = STR_LAND_AREA_INFORMATION_TRAM_OWNER; const RoadTypeInfo *rti = GetRoadTypeInfo(tram_rt);
td->owner[i] = tram_owner; td->tramtype = rti->strings.name;
td->tram_speed = rti->max_speed / 2;
tram_owner = GetRoadOwner(tile, RTT_TRAM);
}
/* Is there a mix of owners? */
if ((tram_owner != INVALID_OWNER && tram_owner != td->owner[0]) ||
(road_owner != INVALID_OWNER && road_owner != td->owner[0])) {
uint i = 1;
if (road_owner != INVALID_OWNER) {
td->owner_type[i] = STR_LAND_AREA_INFORMATION_ROAD_OWNER;
td->owner[i] = road_owner;
i++;
}
if (tram_owner != INVALID_OWNER) {
td->owner_type[i] = STR_LAND_AREA_INFORMATION_TRAM_OWNER;
td->owner[i] = tram_owner;
}
}
if (!IsTunnel(tile)) {
uint16 spd = GetBridgeSpec(GetBridgeType(tile))->speed;
if (road_rt != INVALID_ROADTYPE && (td->road_speed == 0 || spd < td->road_speed)) td->road_speed = spd;
if (tram_rt != INVALID_ROADTYPE && (td->tram_speed == 0 || spd < td->tram_speed)) td->tram_speed = spd;
} }
} }
@@ -2240,10 +2248,6 @@ static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td)
td->rail_speed = spd; td->rail_speed = spd;
} }
} }
} else if (tt == TRANSPORT_ROAD && !IsTunnel(tile)) {
uint16 spd = GetBridgeSpec(GetBridgeType(tile))->speed;
if (road_rt != INVALID_ROADTYPE && (td->road_speed == 0 || spd < td->road_speed)) td->road_speed = spd;
if (tram_rt != INVALID_ROADTYPE && (td->tram_speed == 0 || spd < td->tram_speed)) td->tram_speed = spd;
} }
} }