(svn r6057) -Codechange: made a function GetRandomXXX, that _always_ returns a valid XXX, unless there are none to pick from. Then NULL is returned.

This commit is contained in:
truelight
2006-08-22 21:14:45 +00:00
parent 3cdabcbbac
commit ceb523c29f
7 changed files with 63 additions and 20 deletions

View File

@@ -441,14 +441,12 @@ typedef struct FoundRoute {
static Town *AiFindRandomTown(void)
{
Town *t = GetTown(RandomRange(GetTownArraySize()));
return IsValidTown(t) ? t : NULL;
return GetRandomTown();
}
static Industry *AiFindRandomIndustry(void)
{
Industry *i = GetIndustry(RandomRange(GetIndustryArraySize()));
return IsValidIndustry(i) ? i : NULL;
return GetRandomIndustry();
}
static void AiFindSubsidyIndustryRoute(FoundRoute *fr)