(svn r62) - Added "None" as option for number of industries in difficulty settings

- Updated French translation (by testman57)
This commit is contained in:
orudge
2004-08-15 22:17:46 +00:00
parent 86f4959b55
commit c4b9a9cc70
4 changed files with 78 additions and 28 deletions

View File

@@ -1564,7 +1564,8 @@ Industry *CreateNewIndustry(uint tile, int type)
return i;
}
static const byte _numof_industry_table[3][12] = {
static const byte _numof_industry_table[4][12] = {
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5},
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
{0, 2, 3, 4, 6, 7, 8, 9, 10, 10, 10},
@@ -1573,16 +1574,19 @@ static const byte _numof_industry_table[3][12] = {
static void PlaceInitialIndustry(byte type, int amount)
{
int num = _numof_industry_table[_opt.diff.number_industries][amount];
if (_opt.diff.number_industries != 0)
{
assert(num > 0);
assert(num > 0);
do {
int i = 2000;
do {
if (CreateNewIndustry(TILE_MASK(Random()), type) != NULL)
break;
} while (--i != 0);
} while (--num);
int i = 2000;
do {
if (CreateNewIndustry(TILE_MASK(Random()), type) != NULL)
break;
} while (--i != 0);
} while (--num);
}
}
void GenerateIndustries()