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

(svn r17413) -Fix: assert when trying to build an invalid industry type it did

release/1.0
rubidium 2009-09-04 20:02:35 +00:00
parent fcbdd9c730
commit 925bada35a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/industry_cmd.cpp
View File

@ -1678,7 +1678,10 @@ static Industry *CreateNewIndustryHelper(TileIndex tile, IndustryType type, DoCo
*/
CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
const IndustrySpec *indspec = GetIndustrySpec(GB(p1, 0, 16));
IndustryType it = GB(p1, 0, 16);
if (it >= NUM_INDUSTRYTYPES) return CMD_ERROR;
const IndustrySpec *indspec = GetIndustrySpec(it);
const Industry *ind = NULL;
/* Check if the to-be built/founded industry is available for this climate. */
@ -1717,7 +1720,8 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
} else {
int count = indspec->num_table;
const IndustryTileTable * const *itt = indspec->table;
int num = Clamp(GB(p1, 16, 16), 0, count - 1);
int num = GB(p1, 16, 16);
if (num >= count) return CMD_ERROR;
_error_message = STR_ERROR_SITE_UNSUITABLE;
do {