Remove AUTO_VAR macro and _toString function (#592)

This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions

View File

@@ -34,11 +34,11 @@ RandomScatteredLargeFeature::RandomScatteredLargeFeature(unordered_map<wstring,
{
_init();
for(AUTO_VAR(it, options.begin()); it != options.end(); ++it)
for(auto& option : options)
{
if (it->first.compare(OPTION_SPACING) == 0)
if (option.first.compare(OPTION_SPACING) == 0)
{
spacing = Mth::getInt(it->second, spacing, minSeparation + 1);
spacing = Mth::getInt(option.second, spacing, minSeparation + 1);
}
}
}
@@ -75,9 +75,8 @@ bool RandomScatteredLargeFeature::isFeatureChunk(int x, int z, bool bIsSuperflat
if (forcePlacement || (x == xCenterFeatureChunk && z == zCenterFeatureChunk))
{
Biome *biome = level->getBiomeSource()->getBiome(x * 16 + 8, z * 16 + 8);
for (AUTO_VAR(it,allowedBiomes.begin()); it != allowedBiomes.end(); ++it)
for ( const auto& a : allowedBiomes)
{
Biome *a = *it;
if (biome == a)
{
return true;
@@ -129,8 +128,8 @@ bool RandomScatteredLargeFeature::isSwamphut(int cellX, int cellY, int cellZ)
return false;
}
StructurePiece *first = NULL;
AUTO_VAR(it, structureAt->pieces.begin());
if(it != structureAt->pieces.end() ) first = *it;
auto it = structureAt->pieces.begin();
if(it != structureAt->pieces.end() ) first = *it;
return dynamic_cast<ScatteredFeaturePieces::SwamplandHut *>(first) != NULL;
}