Remove all MSVC __int64 (#742)
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#include "net.minecraft.world.level.storage.h"
|
||||
#include "HellFlatLevelSource.h"
|
||||
|
||||
HellFlatLevelSource::HellFlatLevelSource(Level *level, __int64 seed)
|
||||
HellFlatLevelSource::HellFlatLevelSource(Level *level, int64_t seed)
|
||||
{
|
||||
int xzSize = level->getLevelData()->getXZSize();
|
||||
int hellScale = level->getLevelData()->getHellScale();
|
||||
@@ -26,17 +26,17 @@ void HellFlatLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks)
|
||||
{
|
||||
int height = blocks.length / (16 * 16);
|
||||
|
||||
for (int xc = 0; xc < 16; xc++)
|
||||
for (int xc = 0; xc < 16; xc++)
|
||||
{
|
||||
for (int zc = 0; zc < 16; zc++)
|
||||
for (int zc = 0; zc < 16; zc++)
|
||||
{
|
||||
for (int yc = 0; yc < height; yc++)
|
||||
for (int yc = 0; yc < height; yc++)
|
||||
{
|
||||
int block = 0;
|
||||
if ( (yc <= 6) || ( yc >= 121 ) )
|
||||
{
|
||||
block = Tile::netherRack_Id;
|
||||
}
|
||||
}
|
||||
|
||||
blocks[xc << 11 | zc << 7 | yc] = (byte) block;
|
||||
}
|
||||
@@ -159,8 +159,8 @@ void HellFlatLevelSource::postProcess(ChunkSource *parent, int xt, int zt)
|
||||
// we need to use a separate random - have used the same initialisation code as used in RandomLevelSource::postProcess to make sure this random value
|
||||
// is consistent for each world generation. Also changed all uses of random here to pprandom.
|
||||
pprandom->setSeed(level->getSeed());
|
||||
__int64 xScale = pprandom->nextLong() / 2 * 2 + 1;
|
||||
__int64 zScale = pprandom->nextLong() / 2 * 2 + 1;
|
||||
int64_t xScale = pprandom->nextLong() / 2 * 2 + 1;
|
||||
int64_t zScale = pprandom->nextLong() / 2 * 2 + 1;
|
||||
pprandom->setSeed(((xt * xScale) + (zt * zScale)) ^ level->getSeed());
|
||||
|
||||
int count = pprandom->nextInt(pprandom->nextInt(10) + 1) + 1;
|
||||
@@ -211,7 +211,7 @@ wstring HellFlatLevelSource::gatherStats()
|
||||
vector<Biome::MobSpawnerData *> *HellFlatLevelSource::getMobsAt(MobCategory *mobCategory, int x, int y, int z)
|
||||
{
|
||||
Biome *biome = level->getBiome(x, z);
|
||||
if (biome == NULL)
|
||||
if (biome == NULL)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user