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

Codechange: Make GRF temporary engine data a vector. (#10685) 

This replaces manual C-style realloc/memset/free.
pull/10396/merge
PeterN 2023-04-20 20:38:48 +01:00 committed by GitHub
parent b56be83937
commit 27b4b5d0a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf.cpp
View File

@ -347,7 +347,7 @@ struct GRFTempEngineData {
} }
}; };
static GRFTempEngineData *_gted; ///< Temporary engine data used during NewGRF loading static std::vector<GRFTempEngineData> _gted; ///< Temporary engine data used during NewGRF loading
/** /**
* Contains the GRF ID of the owner of a vehicle if it has been reserved. * Contains the GRF ID of the owner of a vehicle if it has been reserved.
@ -667,11 +667,7 @@ static Engine *GetNewEngine(const GRFFile *file, VehicleType type, uint16 intern
if (engine_pool_size != Engine::GetPoolSize()) { if (engine_pool_size != Engine::GetPoolSize()) {
/* Resize temporary engine data ... */ /* Resize temporary engine data ... */
_gted = ReallocT(_gted, Engine::GetPoolSize()); _gted.resize(Engine::GetPoolSize());
/* and blank the new block. */
size_t len = (Engine::GetPoolSize() - engine_pool_size) * sizeof(*_gted);
memset(_gted + engine_pool_size, 0, len);
} }
if (type == VEH_TRAIN) { if (type == VEH_TRAIN) {
_gted[e->index].railtypelabel = GetRailTypeInfo(e->u.rail.railtype)->label; _gted[e->index].railtypelabel = GetRailTypeInfo(e->u.rail.railtype)->label;
@ -8753,7 +8749,7 @@ void ResetNewGRFData()
ResetRoadTypes(); ResetRoadTypes();
/* Allocate temporary refit/cargo class data */ /* Allocate temporary refit/cargo class data */
_gted = CallocT<GRFTempEngineData>(Engine::GetPoolSize()); _gted.resize(Engine::GetPoolSize());
/* Fill rail type label temporary data for default trains */ /* Fill rail type label temporary data for default trains */
for (const Engine *e : Engine::IterateType(VEH_TRAIN)) { for (const Engine *e : Engine::IterateType(VEH_TRAIN)) {
@ -9928,7 +9924,7 @@ static void AfterLoadGRFs()
FinalisePriceBaseMultipliers(); FinalisePriceBaseMultipliers();
/* Deallocate temporary loading data */ /* Deallocate temporary loading data */
free(_gted); _gted.clear();
_grm_sprites.clear(); _grm_sprites.clear();
} }