mirror of https://github.com/OpenTTD/OpenTTD
(svn r11197) -Fix: It is not useful to reset the override of an entity every time a new grf file is been submitted.
Since newhouses showed the way to newindustries(meaning I copied/adapted a lot of code and processes from it), the behaviour was there for newhouses too.release/0.6
parent
dca398e9a6
commit
7525f791c7
|
@ -71,6 +71,10 @@ void ResetIndustries()
|
|||
|
||||
memset(&_industry_tile_specs, 0, sizeof(_industry_tile_specs));
|
||||
memcpy(&_industry_tile_specs, &_origin_industry_tile_specs, sizeof(_origin_industry_tile_specs));
|
||||
|
||||
/* Reset any overrides that have been set. */
|
||||
_industile_mngr.ResetOverride();
|
||||
_industry_mngr.ResetOverride();
|
||||
}
|
||||
|
||||
void ResetIndustryCreationProbility(IndustryType type)
|
||||
|
|
|
@ -1206,9 +1206,6 @@ static bool TownHouseChangeInfo(uint hid, int numinfo, int prop, byte **bufp, in
|
|||
/* Allocate house specs if they haven't been allocated already. */
|
||||
if (_cur_grffile->housespec == NULL) {
|
||||
_cur_grffile->housespec = CallocT<HouseSpec*>(HOUSE_MAX);
|
||||
|
||||
/* Reset any overrides that have been set. */
|
||||
_house_mngr.ResetOverride();
|
||||
}
|
||||
|
||||
for (int i = 0; i < numinfo; i++) {
|
||||
|
@ -1715,9 +1712,6 @@ static bool IndustrytilesChangeInfo(uint indtid, int numinfo, int prop, byte **b
|
|||
/* Allocate industry tile specs if they haven't been allocated already. */
|
||||
if (_cur_grffile->indtspec == NULL) {
|
||||
_cur_grffile->indtspec = CallocT<IndustryTileSpec*>(NUM_INDUSTRYTILES);
|
||||
|
||||
/* Reset any overrides that have been set. */
|
||||
_industile_mngr.ResetOverride();
|
||||
}
|
||||
|
||||
for (int i = 0; i < numinfo; i++) {
|
||||
|
@ -1826,9 +1820,6 @@ static bool IndustriesChangeInfo(uint indid, int numinfo, int prop, byte **bufp,
|
|||
/* Allocate industry specs if they haven't been allocated already. */
|
||||
if (_cur_grffile->industryspec == NULL) {
|
||||
_cur_grffile->industryspec = CallocT<IndustrySpec*>(NUM_INDUSTRYTYPES);
|
||||
|
||||
/* Reset any overrides that have been set. */
|
||||
_industry_mngr.ResetOverride();
|
||||
}
|
||||
|
||||
for (int i = 0; i < numinfo; i++) {
|
||||
|
|
|
@ -2522,4 +2522,7 @@ void ResetHouses()
|
|||
{
|
||||
memset(&_house_specs, 0, sizeof(_house_specs));
|
||||
memcpy(&_house_specs, &_original_house_specs, sizeof(_original_house_specs));
|
||||
|
||||
/* Reset any overrides that have been set. */
|
||||
_house_mngr.ResetOverride();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue