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

(svn r19643) -Fix (r19120): Industry generation failed for large maps and lots of industry types.

release/1.1
frosch 2010-04-16 21:21:54 +00:00
parent d1c3234918
commit 2141ca2368
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/random_func.cpp
View File

@ -57,6 +57,7 @@ uint32 DoRandom(int line, const char *file)
uint DoRandomRange(uint max, int line, const char *file) uint DoRandomRange(uint max, int line, const char *file)
{ {
assert(max <= UINT16_MAX);
return GB(DoRandom(line, file), 0, 16) * max >> 16; return GB(DoRandom(line, file), 0, 16) * max >> 16;
} }
#endif /* RANDOM_DEBUG */ #endif /* RANDOM_DEBUG */

3
src/core/random_func.hpp
View File

@ -99,8 +99,9 @@ void SetRandomSeed(uint32 seed);
return _random.Next(); return _random.Next();
} }
static FORCEINLINE uint32 RandomRange(uint16 max) static FORCEINLINE uint32 RandomRange(uint max)
{ {
assert(max <= UINT16_MAX);
return _random.Next(max); return _random.Next(max);
} }
#endif #endif

3
src/industry_cmd.cpp
View File

@ -1923,7 +1923,8 @@ void GenerateIndustries()
/* Add the remaining industries according to their probabilities */ /* Add the remaining industries according to their probabilities */
for (uint i = 0; i < total_amount; i++) { for (uint i = 0; i < total_amount; i++) {
uint32 r = RandomRange(total_prob); /* RandomRange() can only deal with 16 bit, which is not enough here. */
uint32 r = ((uint64)Random() * (uint64)total_prob) >> 32;
IndustryType it = 0; IndustryType it = 0;
while (it < NUM_INDUSTRYTYPES && r >= industry_probs[it]) { while (it < NUM_INDUSTRYTYPES && r >= industry_probs[it]) {
r -= industry_probs[it]; r -= industry_probs[it];