mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Simplify testing for railtype map conversion. 

Build the list of railtype conversions at the same time as testing if conversion is needed.

This avoids having two similar loops which need to compare the same things.
pull/12879/head
Peter Nelson 2024-10-22 17:42:36 +01:00 committed by Peter Nelson
parent 36c735ebfa
commit 157d028915
1 changed files with 45 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/saveload/labelmaps_sl.cpp
View File

@ -22,67 +22,59 @@ static std::vector<RailTypeLabel> _railtype_list;
/** /**
* Test if any saved rail type labels are different to the currently loaded * Test if any saved rail type labels are different to the currently loaded
* rail types, which therefore requires conversion. * rail types. Rail types stored in the map will be converted if necessary.
* @return true if (and only if) conversion due to rail type changes is needed.
*/ */
static bool NeedRailTypeConversion() static void ConvertRailTypes()
{ {
for (uint i = 0; i < _railtype_list.size(); i++) { std::vector<RailType> railtype_conversion_map;
if ((RailType)i < RAILTYPE_END) { bool needs_conversion = false;
const RailTypeInfo *rti = GetRailTypeInfo((RailType)i);
if (rti->label != _railtype_list[i]) return true; for (auto it = std::begin(_railtype_list); it != std::end(_railtype_list); ++it) {
} else { RailType rt = GetRailTypeByLabel(*it);
if (_railtype_list[i] != 0) return true; if (rt == INVALID_RAILTYPE) {
rt = RAILTYPE_RAIL;
}
railtype_conversion_map.push_back(rt);
/* Conversion is needed if the rail type is in a different position than the list. */
if (*it != 0 && rt != std::distance(std::begin(_railtype_list), it)) needs_conversion = true;
}
if (!needs_conversion) return;
for (TileIndex t : Map::Iterate()) {
switch (GetTileType(t)) {
case MP_RAILWAY:
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
break;
case MP_ROAD:
if (IsLevelCrossing(t)) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
}
break;
case MP_STATION:
if (HasStationRail(t)) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
}
break;
case MP_TUNNELBRIDGE:
if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
}
break;
default:
break;
} }
} }
/* No rail type conversion is necessary */
return false;
} }
void AfterLoadLabelMaps() void AfterLoadLabelMaps()
{ {
if (NeedRailTypeConversion()) { ConvertRailTypes();
std::vector<RailType> railtype_conversion_map;
for (uint i = 0; i < _railtype_list.size(); i++) {
RailType r = GetRailTypeByLabel(_railtype_list[i]);
if (r == INVALID_RAILTYPE) r = RAILTYPE_BEGIN;
railtype_conversion_map.push_back(r);
}
for (TileIndex t = 0; t < Map::Size(); t++) {
switch (GetTileType(t)) {
case MP_RAILWAY:
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
break;
case MP_ROAD:
if (IsLevelCrossing(t)) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
}
break;
case MP_STATION:
if (HasStationRail(t)) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
}
break;
case MP_TUNNELBRIDGE:
if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) {
SetRailType(t, railtype_conversion_map[GetRailType(t)]);
}
break;
default:
break;
}
}
}
ResetLabelMaps();
} }
void ResetLabelMaps() void ResetLabelMaps()
@ -120,8 +112,6 @@ struct RAILChunkHandler : ChunkHandler {
{ {
const std::vector<SaveLoad> slt = SlCompatTableHeader(_label_object_desc, _label_object_sl_compat); const std::vector<SaveLoad> slt = SlCompatTableHeader(_label_object_desc, _label_object_sl_compat);
ResetLabelMaps();
LabelObject lo; LabelObject lo;
while (SlIterateArray() != -1) { while (SlIterateArray() != -1) {