gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-08 15:30:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: NewGRF house class mappings were not reset between games. (#11279)

Browse Source
This commit is contained in:
PeterN 2023-09-10 18:55:37 +01:00 committed by GitHub
parent 1c620b349f
commit 6643c010bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/newgrf_house.cpp
View File

@ -25,7 +25,7 @@
#include "safeguards.h"
static BuildingCounts<uint32_t> _building_counts;
static HouseClassMapping _class_mapping[HOUSE_CLASS_MAX];
static std::array<HouseClassMapping, HOUSE_CLASS_MAX> _class_mapping;
HouseOverrideManager _house_mngr(NEW_HOUSE_OFFSET, NUM_HOUSES, INVALID_HOUSE_ID);
@ -72,6 +72,11 @@ uint32_t HouseResolverObject::GetDebugID() const
return HouseSpec::Get(this->house_scope.house_id)->grf_prop.local_id;
}
void ResetHouseClassIDs()
{
_class_mapping = {};
}
HouseClassID AllocateHouseClassID(byte grf_class_id, uint32_t grfid)
{
/* Start from 1 because 0 means that no class has been assigned. */

1
src/newgrf_house.h
View File

@ -87,6 +87,7 @@ struct HouseClassMapping {
uint8_t class_id; ///< The class id within the grf file
};
void ResetHouseClassIDs();
HouseClassID AllocateHouseClassID(byte grf_class_id, uint32_t grfid);
void InitializeBuildingCounts();

2
src/town_cmd.cpp
View File

@ -3842,6 +3842,8 @@ HouseSpec _house_specs[NUM_HOUSES];
void ResetHouses()
{
ResetHouseClassIDs();
auto insert = std::copy(std::begin(_original_house_specs), std::end(_original_house_specs), std::begin(_house_specs));
std::fill(insert, std::end(_house_specs), HouseSpec{});