From 27be62d8d5569505f2d87bf83267c3ed635112bd Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sat, 29 Jun 2024 14:41:53 +0200 Subject: [PATCH] Minor simplification of energy update logic --- src/openrct2/entity/Guest.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 304681d325..f7f8c5e64a 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -843,11 +843,8 @@ void Guest::UpdateConsumptionMotives() newEnergy = newTargetEnergy; } - if (newEnergy < kPeepMinEnergy) - newEnergy = kPeepMinEnergy; - /* Previous code here suggested maximum energy is 128. */ - newEnergy = std::min(kPeepMaxEnergy, newEnergy); + newEnergy = std::clamp(newEnergy, kPeepMinEnergy, kPeepMaxEnergy); if (newEnergy != Energy) {