Remove all MSVC __int64 (#742)

This commit is contained in:
void_17
2026-03-07 03:31:30 +07:00
committed by GitHub
parent 175fc3824e
commit 988e3042e0
277 changed files with 3672 additions and 3684 deletions

View File

@@ -45,13 +45,13 @@ void Dimension::init()
}
else
#endif
if (level->getLevelData()->getGenerator() == LevelType::lvl_flat)
if (level->getLevelData()->getGenerator() == LevelType::lvl_flat)
{
FlatGeneratorInfo *generator = FlatGeneratorInfo::fromValue(level->getLevelData()->getGeneratorOptions());
biomeSource = new FixedBiomeSource(Biome::biomes[generator->getBiome()], 0.5f, 0.5f);
delete generator;
}
else
else
{
biomeSource = new BiomeSource(level);
}
@@ -84,11 +84,11 @@ ChunkSource *Dimension::createRandomLevelSource() const
}
else
#endif
if (levelType == LevelType::lvl_flat)
if (levelType == LevelType::lvl_flat)
{
return new FlatLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
}
else
}
else
{
return new RandomLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
}
@@ -113,7 +113,7 @@ bool Dimension::isValidSpawn(int x, int z) const
return true;
}
float Dimension::getTimeOfDay(__int64 time, float a) const
float Dimension::getTimeOfDay(int64_t time, float a) const
{
int dayStep = (int) (time % Level::TICKS_PER_DAY);
float td = (dayStep + a) / Level::TICKS_PER_DAY - 0.25f;
@@ -125,7 +125,7 @@ float Dimension::getTimeOfDay(__int64 time, float a) const
return td;
}
int Dimension::getMoonPhase(__int64 time) const
int Dimension::getMoonPhase(int64_t time) const
{
return ((int) (time / Level::TICKS_PER_DAY)) % 8;
}
@@ -210,16 +210,16 @@ Pos *Dimension::getSpawnPos()
return NULL;
}
int Dimension::getSpawnYPosition()
int Dimension::getSpawnYPosition()
{
if (levelType == LevelType::lvl_flat)
if (levelType == LevelType::lvl_flat)
{
return 4;
}
return Level::genDepth / 2;
}
bool Dimension::hasBedrockFog()
bool Dimension::hasBedrockFog()
{
// 4J-PB - turn off bedrock fog if the host player doesn't want it
if(app.GetGameHostOption(eGameHostOption_BedrockFog)==0)
@@ -230,9 +230,9 @@ bool Dimension::hasBedrockFog()
return (levelType != LevelType::lvl_flat && !hasCeiling);
}
double Dimension::getClearColorScale()
double Dimension::getClearColorScale()
{
if (levelType == LevelType::lvl_flat)
if (levelType == LevelType::lvl_flat)
{
return 1.0;
}