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

Codechange: Initialise specs with std::fill/std::copy instead of memset/memcpy.

Browse Source
This commit is contained in:
Peter Nelson
2023-01-08 01:36:07 +00:00
committed by PeterN
parent d0c71f2a9e
commit 087654501b
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/newgrf_airport.cpp
View File

@@ -152,9 +152,10 @@ bool AirportSpec::IsWithinMapBounds(byte table, TileIndex tile) const
*/
void AirportSpec::ResetAirports()
{
extern const AirportSpec _origin_airport_specs[];
memset(&AirportSpec::specs, 0, sizeof(AirportSpec::specs));
memcpy(&AirportSpec::specs, &_origin_airport_specs, sizeof(AirportSpec) * NEW_AIRPORT_OFFSET);
extern const AirportSpec _origin_airport_specs[NEW_AIRPORT_OFFSET];
auto insert = std::copy(std::begin(_origin_airport_specs), std::end(_origin_airport_specs), std::begin(AirportSpec::specs));
std::fill(insert, std::end(AirportSpec::specs), AirportSpec{});
_airport_mngr.ResetOverride();
}