From 58414e8a562b8f7694f6b4f3f61475cd76cf065d Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Mon, 20 Nov 2023 05:16:03 +0100 Subject: [PATCH] Revert to old clamp() compat version --- Source/loadsave.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index dbe9276e4..7a1dd9538 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -36,6 +36,7 @@ #include "stores.h" #include "utils/endian.hpp" #include "utils/language.h" +#include "utils/stdcompat/algorithm.hpp" namespace devilution { @@ -975,8 +976,8 @@ void LoadMatchingItems(LoadHelper &file, const Player &player, const int n, Item unpackedItem._iIdentified = heroItem._iIdentified; unpackedItem._iMaxDur = heroItem._iMaxDur; unpackedItem._iDurability = ClampDurability(unpackedItem, heroItem._iDurability); - unpackedItem._iMaxCharges = std::clamp(heroItem._iMaxCharges, 0, unpackedItem._iMaxCharges); - unpackedItem._iCharges = std::clamp(heroItem._iCharges, 0, unpackedItem._iMaxCharges); + unpackedItem._iMaxCharges = clamp(heroItem._iMaxCharges, 0, unpackedItem._iMaxCharges); + unpackedItem._iCharges = clamp(heroItem._iCharges, 0, unpackedItem._iMaxCharges); } if (!IsShopPriceValid(unpackedItem)) { unpackedItem.clear();