diff --git a/src/newgrf_airport.cpp b/src/newgrf_airport.cpp index d1e9547d4a..3e81b68c68 100644 --- a/src/newgrf_airport.cpp +++ b/src/newgrf_airport.cpp @@ -181,7 +181,7 @@ void AirportOverrideManager::SetEntitySpec(AirportSpec *as) return; } - memcpy(AirportSpec::GetWithoutOverride(airport_id), as, sizeof(*as)); + *AirportSpec::GetWithoutOverride(airport_id) = *as; /* Now add the overrides. */ for (int i = 0; i < this->max_offset; i++) { diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp index c2e5576636..08ee6a5237 100644 --- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -73,7 +73,7 @@ void AirportTileOverrideManager::SetEntitySpec(const AirportTileSpec *airpts) return; } - memcpy(&AirportTileSpec::tiles[airpt_id], airpts, sizeof(*airpts)); + AirportTileSpec::tiles[airpt_id] = *airpts; /* Now add the overrides. */ for (int i = 0; i < this->max_offset; i++) { diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp index f38d7f3ebb..c33c80beec 100644 --- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -164,7 +164,7 @@ void HouseOverrideManager::SetEntitySpec(const HouseSpec *hs) return; } - MemCpyT(HouseSpec::Get(house_id), hs); + *HouseSpec::Get(house_id) = *hs; /* Now add the overrides. */ for (int i = 0; i < this->max_offset; i++) { @@ -273,7 +273,7 @@ void IndustryTileOverrideManager::SetEntitySpec(const IndustryTileSpec *its) return; } - memcpy(&_industry_tile_specs[indt_id], its, sizeof(*its)); + _industry_tile_specs[indt_id] = *its; /* Now add the overrides. */ for (int i = 0; i < this->max_offset; i++) {