LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-17 05:52:29 +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

10
Minecraft.World/Player/FoodData.cpp
View File

@@ -20,8 +20,8 @@ FoodData::FoodData()
void FoodData::eat(int food, float saturationModifier)
{
foodLevel = min(food + foodLevel, FoodConstants::MAX_FOOD);
saturationLevel = min(saturationLevel + (float) food * saturationModifier * 2.0f, (float)foodLevel);
foodLevel = std::min(food + foodLevel, FoodConstants::MAX_FOOD);
saturationLevel = std::min(saturationLevel + (float) food * saturationModifier * 2.0f, (float)foodLevel);
}
void FoodData::eat(FoodItem *item)
@@ -42,11 +42,11 @@ void FoodData::tick(std::shared_ptr<Player> player)
if (saturationLevel > 0)
{
saturationLevel = max(saturationLevel - 1, 0.0f);
saturationLevel = std::max(saturationLevel - 1, 0.0f);
}
else if (difficulty > Difficulty::PEACEFUL)
{
foodLevel = max(foodLevel - 1, 0);
foodLevel = std::max(foodLevel - 1, 0);
}
}
@@ -130,7 +130,7 @@ bool FoodData::needsFood()
void FoodData::addExhaustion(float amount)
{
exhaustionLevel = min(exhaustionLevel + amount, FoodConstants::MAX_SATURATION * 2);
exhaustionLevel = std::min(exhaustionLevel + amount, FoodConstants::MAX_SATURATION * 2);
}
float FoodData::getExhaustionLevel()