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

3
src/newgrf.cpp
View File

@@ -569,8 +569,10 @@ static Engine *GetNewEngine(const GRFFile *file, VehicleType type, uint16_t inte
/* Reserve the engine slot */
if (!static_access) {
_engine_mngr.RemoveFromIndex(engine);
EngineIDMapping *eid = _engine_mngr.data() + engine;
eid->grfid = scope_grfid; // Note: this is INVALID_GRFID if dynamic_engines is disabled, so no reservation
_engine_mngr.AddToIndex(engine);
}
return e;
@@ -597,6 +599,7 @@ static Engine *GetNewEngine(const GRFFile *file, VehicleType type, uint16_t inte
type,
std::min<uint8_t>(internal_id, _engine_counts[type]) // substitute_id == _engine_counts[subtype] means "no substitute"
});
_engine_mngr.AddToIndex(e->index);
if (engine_pool_size != Engine::GetPoolSize()) {
/* Resize temporary engine data ... */