LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-12 14:41:55 +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.Client/Textures/Stitching/Stitcher.cpp
View File

@@ -154,7 +154,7 @@ bool Stitcher::addToStorage(TextureHolder *textureHolder)
*/
bool Stitcher::expand(TextureHolder *textureHolder)
{
int minDistance = min(textureHolder->getHeight(), textureHolder->getWidth());
int minDistance = std::min(textureHolder->getHeight(), textureHolder->getWidth());
bool firstAddition = storageX == 0 && storageY == 0;
// It couldn't fit, decide which direction to grow to
@@ -175,7 +175,7 @@ bool Stitcher::expand(TextureHolder *textureHolder)
}
// Even if the smallest side fits the larger might not >.>
int maxDistance = max(textureHolder->getHeight(), textureHolder->getWidth());
int maxDistance = std::max(textureHolder->getHeight(), textureHolder->getWidth());
// TODO: This seems wrong ...
if (firstAddition && !xCanGrow && !(smallestEncompassingPowerOfTwo(storageY + maxDistance) <= maxHeight))
{