Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
Minecraft.World/StrongholdFeature.cpp
View File

@@ -53,21 +53,21 @@ StrongholdFeature::StrongholdFeature(unordered_map<wstring, wstring> options)
{
_init();
for (AUTO_VAR(it, options.begin()); it != options.end(); ++it)
for (auto& option : options)
{
if (it->first.compare(OPTION_DISTANCE) == 0)
if (option.first.compare(OPTION_DISTANCE) == 0)
{
distance = Mth::getDouble(it->second, distance, 1);
distance = Mth::getDouble(option.second, distance, 1);
}
else if (it->first.compare(OPTION_COUNT) == 0)
else if (option.first.compare(OPTION_COUNT) == 0)
{
// 4J-JEV: Removed, we only have the one stronghold.
//strongholdPos = new ChunkPos[ Mth::getInt(it->second, strongholdPos_length, 1) ];
assert(false);
}
else if (it->first.compare(OPTION_SPREAD) == 0)
else if (option.first.compare(OPTION_SPREAD) == 0)
{
spread = Mth::getInt(it->second, spread, 1);
spread = Mth::getInt(option.second, spread, 1);
}
}
}
@@ -174,7 +174,7 @@ bool StrongholdFeature::isFeatureChunk(int x, int z,bool bIsSuperflat)
#ifdef _LARGE_WORLDS
angle = random.nextDouble() * PI * 2.0 * circle / (double) spread;
#endif
}
}
while(!hasFoundValidPos && findAttempts < MAX_STRONGHOLD_ATTEMPTS);
if(!hasFoundValidPos)
@@ -255,8 +255,8 @@ StrongholdFeature::StrongholdStart::StrongholdStart(Level *level, Random *random
while (!pendingChildren->empty())
{
int pos = random->nextInt((int)pendingChildren->size());
AUTO_VAR(it, pendingChildren->begin() + pos);
StructurePiece *structurePiece = *it;
auto it = pendingChildren->begin() + pos;
StructurePiece *structurePiece = *it;
pendingChildren->erase(it);
structurePiece->addChildren(startRoom, &pieces, random);
}