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

Improve performance of updating railtypes when reloading NewGRFs.

Browse Source 
Now O(N) instead of O(N log N), and only traverses map once.
This commit is contained in:
Jonathan G Rennison
2016-04-08 20:27:00 +01:00
parent 75396c9b5f
commit d0aa4a53ed
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/saveload/afterload.cpp
View File

@@ -3264,19 +3264,9 @@ bool AfterLoadGame()
*/ */
void ReloadNewGRFData() void ReloadNewGRFData()
{ {
TileIndex map_size = MapSize(); RailTypeLabel rail_type_label_map[RAILTYPE_END];
for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
/* Backup railtype labels for all rail tiles. The railtype info array will be resorted. */ rail_type_label_map[rt] = GetRailTypeInfo(rt)->label;
std::map<TileIndex, RailTypeLabel> rail_type_label_backups;
for (TileIndex t = 0; t < map_size; t++) {
if (GetTileType(t) == MP_RAILWAY ||
IsLevelCrossingTile(t) ||
IsRailStationTile(t) ||
IsRailWaypointTile(t) ||
IsRailTunnelBridgeTile(t)) {
rail_type_label_backups[t] = GetRailTypeInfo(GetRailType(t))->label;
}
} }
/* reload grf data */ /* reload grf data */
@@ -3305,15 +3295,21 @@ void ReloadNewGRFData()
CheckTrainsLengths(); CheckTrainsLengths();
AfterLoadTemplateVehiclesUpdateImage(); AfterLoadTemplateVehiclesUpdateImage();
RailType rail_type_translate_map[RAILTYPE_END];
for (RailType old_type = RAILTYPE_BEGIN; old_type != RAILTYPE_END; old_type++) {
RailType new_type = GetRailTypeByLabel(rail_type_label_map[old_type]);
rail_type_translate_map[old_type] = (new_type == INVALID_RAILTYPE) ? RAILTYPE_RAIL : new_type;
}
/* Restore correct railtype for all rail tiles.*/ /* Restore correct railtype for all rail tiles.*/
const TileIndex map_size = MapSize();
for (TileIndex t = 0; t < map_size; t++) { for (TileIndex t = 0; t < map_size; t++) {
if (GetTileType(t) == MP_RAILWAY || if (GetTileType(t) == MP_RAILWAY ||
IsLevelCrossingTile(t) || IsLevelCrossingTile(t) ||
IsRailStationTile(t) || IsRailStationTile(t) ||
IsRailWaypointTile(t) || IsRailWaypointTile(t) ||
IsRailTunnelBridgeTile(t)) { IsRailTunnelBridgeTile(t)) {
RailType old_type = GetRailTypeByLabel(rail_type_label_backups[t]); SetRailType(t, rail_type_translate_map[GetRailType(t)]);
SetRailType(t, (old_type == INVALID_RAILTYPE) ? RAILTYPE_RAIL : old_type);
} }
} }
} }