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

Convert secondary rail types in AfterLoadLabelMaps

Browse Source 
Handle missing rail types
This commit is contained in:
Jonathan G Rennison
2019-04-11 01:48:02 +01:00
parent f887b12be2
commit 8c3d1b1c45
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/saveload/labelmaps_sl.cpp
View File

@@ -42,36 +42,45 @@ static bool NeedRailTypeConversion()
void AfterLoadLabelMaps() void AfterLoadLabelMaps()
{ {
if (NeedRailTypeConversion()) { if (NeedRailTypeConversion()) {
std::vector<RailType> railtype_conversion_map; RailType railtype_conversion_map[RAILTYPE_END];
for (uint i = 0; i < _railtype_list.size(); i++) { for (uint i = 0; i < _railtype_list.size(); i++) {
RailType r = GetRailTypeByLabel(_railtype_list[i]); RailType r = GetRailTypeByLabel(_railtype_list[i]);
if (r == INVALID_RAILTYPE) r = RAILTYPE_BEGIN; if (r == INVALID_RAILTYPE) r = RAILTYPE_BEGIN;
railtype_conversion_map.push_back(r); railtype_conversion_map[i] = r;
} }
for (uint i = _railtype_list.size(); i < RAILTYPE_END; i++) {
railtype_conversion_map[i] = RAILTYPE_RAIL;
}
auto convert = [&](TileIndex t) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
RailType secondary = GetTileSecondaryRailTypeIfValid(t);
if (secondary != INVALID_RAILTYPE) SetSecondaryRailType(t, railtype_conversion_map[secondary]);
};
for (TileIndex t = 0; t < MapSize(); t++) { for (TileIndex t = 0; t < MapSize(); t++) {
switch (GetTileType(t)) { switch (GetTileType(t)) {
case MP_RAILWAY: case MP_RAILWAY:
SetRailType(t, railtype_conversion_map[GetRailType(t)]); convert(t);
break; break;
case MP_ROAD: case MP_ROAD:
if (IsLevelCrossing(t)) { if (IsLevelCrossing(t)) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]); convert(t);
} }
break; break;
case MP_STATION: case MP_STATION:
if (HasStationRail(t)) { if (HasStationRail(t)) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]); convert(t);
} }
break; break;
case MP_TUNNELBRIDGE: case MP_TUNNELBRIDGE:
if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) { if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]); convert(t);
} }
break; break;