phaneron/smartcmd-MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-16 17:13:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of MSVC's __int64

Browse source 
Use either int64_t, uint64_t or long long and unsigned long long, defined as per C++11 standard
This commit is contained in:
void_17 2026-03-02 15:53:32 +07:00
parent d6ec138710
commit d63f79325f
308 changed files with 5371 additions and 5379 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Minecraft.World/Random.cpp
View file

@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "Random.h"
#include "System.h"
@ -6,19 +6,19 @@ Random::Random()
{
// 4J - jave now uses the system nanosecond counter added to a "seedUniquifier" to get an initial seed. Our nanosecond timer is actually only millisecond accuate, so
// use QueryPerformanceCounter here instead
__int64 seed;
int64_t seed;
QueryPerformanceCounter((LARGE_INTEGER *)&seed);
seed += 8682522807148012LL;
setSeed(seed);
}
Random::Random(__int64 seed)
Random::Random(int64_t seed)
{
setSeed(seed);
}
void Random::setSeed(__int64 s)
void Random::setSeed(int64_t s)
{
this->seed = (s ^ 0x5DEECE66DLL) & ((1LL << 48) - 1);
haveNextNextGaussian = false;
@ -41,7 +41,7 @@ void Random::nextBytes(byte *bytes, unsigned int count)
double Random::nextDouble()
{
return (((__int64)next(26) << 27) + next(27))
return (((int64_t)next(26) << 27) + next(27))
/ (double)(1LL << 53);
}
@ -56,7 +56,7 @@ double Random::nextGaussian()
{
double v1, v2, s;
do
{
{
v1 = 2 * nextDouble() - 1; // between -1.0 and 1.0
v2 = 2 * nextDouble() - 1; // between -1.0 and 1.0
s = v1 * v1 + v2 * v2;
@ -79,7 +79,7 @@ int Random::nextInt(int n)
if ((n & -n) == n) // i.e., n is a power of 2
return (int)(((__int64)next(31) * n) >> 31); // 4J Stu - Made __int64 instead of long
return (int)(((int64_t)next(31) * n) >> 31); // 4J Stu - Made int64_t instead of long
int bits, val;
do
@ -95,9 +95,9 @@ float Random::nextFloat()
return next(24) / ((float)(1 << 24));
}
__int64 Random::nextLong()
int64_t Random::nextLong()
{
return ((__int64)next(32) << 32) + next(32);
return ((int64_t)next(32) << 32) + next(32);
}
bool Random::nextBoolean()