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

Use btree_multimap for pending speed restrictions

Browse Source 
Avoid unnecessary iteration when saving VESR chunk
This commit is contained in:
Jonathan G Rennison
2023-03-07 00:19:43 +00:00
parent 70311c0843
commit 8dca681c8c
4 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/saveload/vehicle_sl.cpp
View File

@@ -22,6 +22,7 @@
#include "../string_func.h"
#include "../error.h"
#include "../strings_func.h"
#include "../3rdparty/cpp-btree/btree_map.h"
#include "saveload.h"
@@ -29,6 +30,8 @@
#include "../safeguards.h"
extern btree::btree_multimap<VehicleID, PendingSpeedRestrictionChange> _pending_speed_restriction_change_map;
/**
* Link front and rear multiheaded engines to each other
* This is done when loading a savegame
@@ -1134,15 +1137,10 @@ const SaveLoadTable GetVehicleSpeedRestrictionDescription()
void Save_VESR()
{
for (Train *t : Train::Iterate()) {
if (HasBit(t->flags, VRF_PENDING_SPEED_RESTRICTION)) {
auto range = pending_speed_restriction_change_map.equal_range(t->index);
for (auto it = range.first; it != range.second; ++it) {
SlSetArrayIndex(t->index);
PendingSpeedRestrictionChange *ptr = &(it->second);
SlObject(ptr, GetVehicleSpeedRestrictionDescription());
}
}
for (auto &it : _pending_speed_restriction_change_map) {
SlSetArrayIndex(it.first);
PendingSpeedRestrictionChange *ptr = &(it.second);
SlObject(ptr, GetVehicleSpeedRestrictionDescription());
}
}
@@ -1150,7 +1148,7 @@ void Load_VESR()
{
int index;
while ((index = SlIterateArray()) != -1) {
auto iter = pending_speed_restriction_change_map.insert({ static_cast<VehicleID>(index), {} });
auto iter = _pending_speed_restriction_change_map.insert({ static_cast<VehicleID>(index), {} });
PendingSpeedRestrictionChange *ptr = &(iter->second);
SlObject(ptr, GetVehicleSpeedRestrictionDescription());
}