Core/Shared: Change rand32 to return uin32 instead of int32

Fixes a crash that happened when rand32 returned negative values.
Also updated some related comments that were outdated since we changed to SFMT.

Closes #12638
This commit is contained in:
DDuarte
2014-07-25 15:00:40 +01:00
parent 435baba1c9
commit 0b75e38755
4 changed files with 14 additions and 21 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ using boost::asio::ip::tcp;
using boost::asio::streambuf;
WorldSocket::WorldSocket(tcp::socket&& socket)
: _socket(std::move(socket)), _authSeed(static_cast<uint32>(rand32())), _OverSpeedPings(0), _worldSession(nullptr)
: _socket(std::move(socket)), _authSeed(rand32()), _OverSpeedPings(0), _worldSession(nullptr)
{
}
+1 -1
View File
@@ -281,7 +281,7 @@ void WardenWin::RequestData()
}
case MODULE_CHECK:
{
uint32 seed = static_cast<uint32>(rand32());
uint32 seed = rand32();
buff << uint32(seed);
HmacHash hmac(4, (uint8*)&seed);
hmac.UpdateData(wd->Str);
+4 -4
View File
@@ -63,17 +63,17 @@ float frand(float min, float max)
return float(GetRng()->Random() * (max - min) + min);
}
int32 rand32()
uint32 rand32()
{
return int32(GetRng()->BRandom());
return GetRng()->BRandom();
}
double rand_norm(void)
double rand_norm()
{
return GetRng()->Random();
}
double rand_chance(void)
double rand_chance()
{
return GetRng()->Random() * 100.0;
}
+8 -15
View File
@@ -76,30 +76,23 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText = false, bool hou
uint32 TimeStringToSecs(const std::string& timestring);
std::string TimeToTimestampStr(time_t t);
/* Return a random number in the range min..max; (max-min) must be smaller than 32768. */
/* Return a random number in the range min..max. */
int32 irand(int32 min, int32 max);
/* Return a random number in the range min..max (inclusive). For reliable results, the difference
* between max and min should be less than RAND32_MAX. */
/* Return a random number in the range min..max (inclusive). */
uint32 urand(uint32 min, uint32 max);
/* Return a random number in the range 0 .. RAND32_MAX. */
int32 rand32();
/* Return a random number in the range 0 .. UINT32_MAX. */
uint32 rand32();
/* Return a random number in the range min..max */
float frand(float min, float max);
/* Return a random double from 0.0 to 1.0 (exclusive). Floats support only 7 valid decimal digits.
* A double supports up to 15 valid decimal digits and is used internally (RAND32_MAX has 10 digits).
* With an FPU, there is usually no difference in performance between float and double.
*/
double rand_norm(void);
/* Return a random double from 0.0 to 1.0 (exclusive). */
double rand_norm();
/* Return a random double from 0.0 to 99.9999999999999. Floats support only 7 valid decimal digits.
* A double supports up to 15 valid decimal digits and is used internally (RAND32_MAX has 10 digits).
* With an FPU, there is usually no difference in performance between float and double.
*/
double rand_chance(void);
/* Return a random double from 0.0 to 100.0 (exclusive). */
double rand_chance();
/* Return true if a random roll fits in the specified chance (range 0-100). */
inline bool roll_chance_f(float chance)