gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-13 02:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #10627: Houses subsitute specs should only be copied on first definition.

Browse Source 
Before #10627, substitue specs were always copied despite redefinition.
This commit is contained in:
Peter Nelson 2023-04-17 00:03:39 +01:00 committed by PeterN
parent 7535eb65e2
commit 64782cf005
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/newgrf.cpp
View File

@ -2387,25 +2387,26 @@ static ChangeInfoResult TownHouseChangeInfo(uint hid, int numinfo, int prop, Byt
/* Allocate space for this house. */ /* Allocate space for this house. */
if (housespec == nullptr) { if (housespec == nullptr) {
/* Only the first property 08 setting copies properties; if you later change it, properties will stay. */
_cur.grffile->housespec[hid + i] = std::make_unique<HouseSpec>(*HouseSpec::Get(subs_id)); _cur.grffile->housespec[hid + i] = std::make_unique<HouseSpec>(*HouseSpec::Get(subs_id));
housespec = _cur.grffile->housespec[hid + i].get(); housespec = _cur.grffile->housespec[hid + i].get();
}
housespec->enabled = true; housespec->enabled = true;
housespec->grf_prop.local_id = hid + i; housespec->grf_prop.local_id = hid + i;
housespec->grf_prop.subst_id = subs_id; housespec->grf_prop.subst_id = subs_id;
housespec->grf_prop.grffile = _cur.grffile; housespec->grf_prop.grffile = _cur.grffile;
housespec->random_colour[0] = 0x04; // those 4 random colours are the base colour housespec->random_colour[0] = 0x04; // those 4 random colours are the base colour
housespec->random_colour[1] = 0x08; // for all new houses housespec->random_colour[1] = 0x08; // for all new houses
housespec->random_colour[2] = 0x0C; // they stand for red, blue, orange and green housespec->random_colour[2] = 0x0C; // they stand for red, blue, orange and green
housespec->random_colour[3] = 0x06; housespec->random_colour[3] = 0x06;
/* Make sure that the third cargo type is valid in this /* Make sure that the third cargo type is valid in this
* climate. This can cause problems when copying the properties * climate. This can cause problems when copying the properties
* of a house that accepts food, where the new house is valid * of a house that accepts food, where the new house is valid
* in the temperate climate. */ * in the temperate climate. */
if (!CargoSpec::Get(housespec->accepts_cargo[2])->IsValid()) { if (!CargoSpec::Get(housespec->accepts_cargo[2])->IsValid()) {
housespec->cargo_acceptance[2] = 0; housespec->cargo_acceptance[2] = 0;
}
} }
break; break;
} }