(svn r7451) -Fix (7372): GetNum(Towns|Industries) should return the actual number of towns and industries.

-Fix (6055): GetMax(Town|Industry)Index should not return the number of towns or industries - 1, but the size of the pool - 1.
This commit is contained in:
rubidium
2006-12-09 14:14:51 +00:00
parent 37b4075385
commit af5c73c12e
4 changed files with 8 additions and 6 deletions

View File

@@ -110,6 +110,7 @@ void DestroyIndustry(Industry *i)
}
_industry_sort_dirty = true;
_total_industries--;
DeleteSubsidyWithIndustry(i->index);
DeleteWindowById(WC_INDUSTRY_VIEW, i->index);
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0);
@@ -1361,7 +1362,7 @@ static Industry *AllocateIndustry(void)
if (IsValidIndustry(i)) continue;
if (i->index >= _total_industries) _total_industries = i->index + 1;
_total_industries++;
memset(i, 0, sizeof(*i));
i->index = index;
@@ -1917,7 +1918,7 @@ static void Load_INDY(void)
i = GetIndustry(index);
SlObject(i, _industry_desc);
if (index >= _total_industries) _total_industries = index + 1;
_total_industries++;
}
}