From 612f26c132280da43ecfa5fa8c8cc32966f06eb6 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 25 Jan 2022 12:24:14 -0800 Subject: d_kankyo_wether / d_eye_hl (#178) * d_eye_hl / d_kankyo_wether wip * more d_kankyo_wether + format * remove asm * some d_kankyo wip * fix dccs vtable * some m_Do_graphic / d_meter2_draw work --- include/SSystem/SComponent/c_lib.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'include/SSystem/SComponent') diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 21607f9b6d..890e8ea64c 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -48,15 +48,17 @@ inline u8 cLib_checkBit(u8& pVar, u8 pBit) { } template -inline T cLib_minMaxLimit(T param_0, T min, T max) { - if (param_0 < min) { - return max; +inline T cLib_minMaxLimit(T val, T min, T max) { + T ret; + if (val < min) { + ret = min; + } else { + ret = max; + if (val <= max) { + ret = val; + } } - min = param_0; - if (min > max) { - min = max; - } - return min; + return ret; } void MtxInit(void); -- cgit v1.2.3