summaryrefslogtreecommitdiff
path: root/include/SSystem
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-01-25 12:24:14 -0800
committerGitHub <noreply@github.com>2022-01-25 21:24:14 +0100
commit612f26c132280da43ecfa5fa8c8cc32966f06eb6 (patch)
treeac20d071712cf830ec526222c98d340d90721f77 /include/SSystem
parent6f4d068f1d7c5a9f25f1920e64e5b10dc29aea07 (diff)
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
Diffstat (limited to 'include/SSystem')
-rw-r--r--include/SSystem/SComponent/c_lib.h18
1 files changed, 10 insertions, 8 deletions
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 <typename T>
-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);