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

Add hash table index to EngineOverrideManager

Browse Source 
Use for EngineOverrideManager::GetID lookups
This commit is contained in:
Jonathan G Rennison
2024-05-31 21:18:53 +01:00
parent 556722399a
commit f09f412c43
4 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/engine_override.h
View File

@@ -13,6 +13,7 @@
#include "engine_type.h"
#include "vehicle_type.h"
#include "3rdparty/robin_hood/robin_hood.h"
#include <vector>
struct EngineIDMapping {
@@ -29,9 +30,27 @@ struct EngineIDMapping {
struct EngineOverrideManager : std::vector<EngineIDMapping> {
static const uint NUM_DEFAULT_ENGINES; ///< Number of default entries
private:
static uint64_t HashKey(VehicleType type, uint16_t grf_local_id, uint32_t grfid)
{
return grfid | (static_cast<uint64_t>(grf_local_id) << 32) | (static_cast<uint64_t>(type) << 48);
}
static uint64_t HashKey(const EngineIDMapping &eid)
{
return HashKey(eid.type, eid.internal_id, eid.grfid);
}
robin_hood::unordered_map<uint64_t, EngineID> mapping_index;
public:
void ResetToDefaultMapping();
EngineID GetID(VehicleType type, uint16_t grf_local_id, uint32_t grfid);
void AddToIndex(EngineID id);
void RemoveFromIndex(EngineID id);
void ReIndex();
static bool ResetToCurrentNewGRFConfig();
};