mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17472) -Fix [FS#3182]: industry list was rebuilt too early during industry removal causing the removed industry to be still in the list after removal

release/1.0
rubidium 2009-09-08 12:22:28 +00:00
parent dcd6b2096d
commit 535f71fc13
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/industry.h
View File

@ -84,6 +84,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
} }
static Industry *GetRandom(); static Industry *GetRandom();
static void PostDestructor(size_t index);
}; };
void PlantRandomFarmField(const Industry *i); void PlantRandomFarmField(const Industry *i);

10
src/industry_cmd.cpp
View File

@ -176,10 +176,18 @@ Industry::~Industry()
DeleteIndustryNews(this->index); DeleteIndustryNews(this->index);
DeleteWindowById(WC_INDUSTRY_VIEW, this->index); DeleteWindowById(WC_INDUSTRY_VIEW, this->index);
InvalidateWindowData(WC_INDUSTRY_DIRECTORY, 0, 0);
DeleteSubsidyWith(ST_INDUSTRY, this->index); DeleteSubsidyWith(ST_INDUSTRY, this->index);
CargoPacket::InvalidateAllFrom(ST_INDUSTRY, this->index); CargoPacket::InvalidateAllFrom(ST_INDUSTRY, this->index);
}
/**
* Invalidating some stuff after removing item from the pool.
* @param index index of deleted item
*/
void Industry::PostDestructor(size_t index)
{
InvalidateWindowData(WC_INDUSTRY_DIRECTORY, 0, 0);
Station::RecomputeIndustriesNearForAll(); Station::RecomputeIndustriesNearForAll();
} }