dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r19652) -Fix: RandomRange() is used for bigger ranges in many cases, so generally extent it to handle 32 bits.

Browse Source
This commit is contained in:
frosch
2010-04-17 11:49:25 +00:00
parent abaf6b5b42
commit 83bcde6da4
5 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/random_func.cpp
View File

@@ -24,9 +24,9 @@ uint32 Randomizer::Next()
return this->state[1] = ROR(s, 3) - 1;
}
uint32 Randomizer::Next(uint16 max)
uint32 Randomizer::Next(uint32 max)
{
return GB(this->Next(), 0, 16) * max >> 16;
return ((uint64)this->Next() * (uint64)max) >> 32;
}
void Randomizer::SetSeed(uint32 seed)
@@ -55,9 +55,8 @@ uint32 DoRandom(int line, const char *file)
return _random.Next();
}
uint DoRandomRange(uint max, int line, const char *file)
uint32 DoRandomRange(uint32 max, int line, const char *file)
{
assert(max <= UINT16_MAX);
return GB(DoRandom(line, file), 0, 16) * max >> 16;
return ((uint64)DoRandom(line, file) * (uint64)max) >> 32;
}
#endif /* RANDOM_DEBUG */