petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r10078) -Codechange: Centralize all industry counts data and access

Browse Source
This commit is contained in:
belugas
2007-06-10 01:25:21 +00:00
parent 3afea2d673
commit 08c9365971
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/industry_cmd.cpp
View File

@@ -147,7 +147,6 @@ void DestroyIndustry(Industry *i)
}
_industry_sort_dirty = true;
_total_industries--;
DecIndustryTypeCount(i->type);
DeleteSubsidyWithIndustry(i->index);
@@ -1355,7 +1354,6 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, int type, const Ind
uint32 r;
int j;
_total_industries++;
i->xy = tile;
i->width = i->height = 0;
i->type = type;
@@ -1857,8 +1855,7 @@ void InitializeIndustries()
CleanPool(&_Industry_pool);
AddBlockToPool(&_Industry_pool);
_total_industries = 0;
memset(&_industry_counts, 0, sizeof(_industry_counts));
ResetIndustryCounts();
_industry_sort_dirty = true;
_industry_sound_tile = 0;
}
@@ -1926,7 +1923,7 @@ static void Load_INDY()
{
int index;
_total_industries = 0;
ResetIndustryCounts();
while ((index = SlIterateArray()) != -1) {
Industry *i;
@@ -1937,8 +1934,6 @@ static void Load_INDY()
i = GetIndustry(index);
SlObject(i, _industry_desc);
IncIndustryTypeCount(i->type);
_total_industries++;
}
}