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

Codechange: Use std::array for vehicle hashes. 

This allows initialisation without memset.
pull/13787/head
Peter Nelson 2025-03-09 05:48:22 +00:00 committed by Peter Nelson
parent ec71f7a216
commit 52bada216c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vehicle.cpp
View File

@ -381,7 +381,7 @@ const int TOTAL_HASH_MASK = TOTAL_HASH_SIZE - 1;
* Profiling results show that 0 is fastest. */ * Profiling results show that 0 is fastest. */
const int HASH_RES = 0; const int HASH_RES = 0;
static Vehicle *_vehicle_tile_hash[TOTAL_HASH_SIZE]; static std::array<Vehicle *, TOTAL_HASH_SIZE> _vehicle_tile_hash{};
static Vehicle *VehicleFromTileHash(int xl, int yl, int xu, int yu, void *data, VehicleFromPosProc *proc, bool find_first) static Vehicle *VehicleFromTileHash(int xl, int yl, int xu, int yu, void *data, VehicleFromPosProc *proc, bool find_first)
{ {
@ -646,7 +646,7 @@ static void UpdateVehicleTileHash(Vehicle *v, bool remove)
v->hash_tile_current = new_hash; v->hash_tile_current = new_hash;
} }
static Vehicle *_vehicle_viewport_hash[1 << (GEN_HASHX_BITS + GEN_HASHY_BITS)]; static std::array<Vehicle *, 1 << (GEN_HASHX_BITS + GEN_HASHY_BITS)> _vehicle_viewport_hash{};
static void UpdateVehicleViewportHash(Vehicle *v, int x, int y, int old_x, int old_y) static void UpdateVehicleViewportHash(Vehicle *v, int x, int y, int old_x, int old_y)
{ {
@ -675,8 +675,8 @@ static void UpdateVehicleViewportHash(Vehicle *v, int x, int y, int old_x, int o
void ResetVehicleHash() void ResetVehicleHash()
{ {
for (Vehicle *v : Vehicle::Iterate()) { v->hash_tile_current = nullptr; } for (Vehicle *v : Vehicle::Iterate()) { v->hash_tile_current = nullptr; }
memset(_vehicle_viewport_hash, 0, sizeof(_vehicle_viewport_hash)); _vehicle_viewport_hash = {};
memset(_vehicle_tile_hash, 0, sizeof(_vehicle_tile_hash)); _vehicle_tile_hash = {};
} }
void ResetVehicleColourMap() void ResetVehicleColourMap()