gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-04 13:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19050) -Fix: Don't call callbacks for disabled industrytypes.

Browse Source
This commit is contained in:
frosch 2010-02-06 20:41:27 +00:00
parent 0ab6f60c62
commit 69184fdc79
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/industry_cmd.cpp
View File

@ -84,12 +84,6 @@ void ResetIndustries()
_industry_mngr.ResetOverride(); _industry_mngr.ResetOverride();
} }
void ResetIndustryCreationProbility(IndustryType type)
{
assert(type < INVALID_INDUSTRYTYPE);
_industry_specs[type].appear_creation[_settings_game.game_creation.landscape] = 0;
}
/** /**
* Retrieve the type for this industry. Although it is accessed by a tile, * Retrieve the type for this industry. Although it is accessed by a tile,
* it will return the general type of industry, and not the sprite index * it will return the general type of industry, and not the sprite index
@ -1822,12 +1816,8 @@ void GenerateIndustries()
ind_spc = GetIndustrySpec(it); ind_spc = GetIndustrySpec(it);
if (!CheckIfCallBackAllowsAvailability(it, IACT_MAPGENERATION)) {
ResetIndustryCreationProbility(it);
}
chance = ind_spc->appear_creation[_settings_game.game_creation.landscape]; chance = ind_spc->appear_creation[_settings_game.game_creation.landscape];
if (ind_spc->enabled && chance > 0 && ind_spc->num_table > 0) { if (ind_spc->enabled && chance > 0 && ind_spc->num_table > 0 && CheckIfCallBackAllowsAvailability(it, IACT_MAPGENERATION)) {
/* once the chance of appearance is determind, it have to be scaled by /* once the chance of appearance is determind, it have to be scaled by
* the difficulty level. The "chance" in question is more an index into * the difficulty level. The "chance" in question is more an index into
* the _numof_industry_table,in fact */ * the _numof_industry_table,in fact */