LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-25 21:55:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: unglob std::{min, max}, manual stuff

Browse Source
This commit is contained in:
Tropical
2026-03-06 20:47:11 -06:00
parent 967ffbb2a6
commit 04ff82ba70
54 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.World/WorldGen/Structures/Village.cpp
View File

@@ -374,10 +374,10 @@ void Village::calcInfo()
for(AUTO_VAR(it, doorInfos.begin()); it != doorInfos.end(); ++it)
{
std::shared_ptr<DoorInfo> dm = *it;
maxRadiusSqr = max(dm->distanceToSqr(center->x, center->y, center->z), maxRadiusSqr);
maxRadiusSqr = std::max(dm->distanceToSqr(center->x, center->y, center->z), maxRadiusSqr);
}
int doorDist= Villages::MaxDoorDist; // Take into local int for PS4 as max takes a reference to the const int there and then needs the value to exist for the linker
radius = max(doorDist, (int) sqrt((float)maxRadiusSqr) + 1);
radius = std::max(doorDist, (int) sqrt((float)maxRadiusSqr) + 1);
}
int Village::getStanding(const std::wstring &playerName)