JUtility / JSupport / misc cleanup

This commit is contained in:
TakaRikka
2023-02-26 22:18:40 -08:00
parent 090dcee012
commit eae9455a7d
27 changed files with 442 additions and 457 deletions
+25 -22
View File
@@ -224,30 +224,32 @@ SECTION_SDATA2 static f64 lit_2315 = 4503599627370496.0 /* cast u32 to float */;
#ifdef NONMATCHING // float literals
void JUTProcBar::adjustMeterLength(u32 param_0, f32* param_1, f32 param_2, f32 param_3,
int* param_4) {
BOOL var2 = false;
float var1 = *param_1;
while (var1 > param_2) {
if (param_0 * var1 * FLOAT_LABEL(lit_2308) / FLOAT_LABEL(lit_2309) <= field_0x114.mWidth - FLOAT_LABEL(lit_2310))
break;
BOOL var2 = false;
float var1 = *param_1;
while (var1 > param_2) {
if (param_0 * var1 * FLOAT_LABEL(lit_2308) / FLOAT_LABEL(lit_2309) <=
field_0x114.mWidth - FLOAT_LABEL(lit_2310))
break;
var1 -= FLOAT_LABEL(lit_2311);
var2 = true;
}
var1 -= FLOAT_LABEL(lit_2311);
var2 = true;
}
if (var1 >= param_3)
*param_4 = 0;
if (var1 > param_3 - FLOAT_LABEL(lit_2312))
var1 = param_3;
if (var1 >= param_3)
*param_4 = 0;
if (var1 > param_3 - FLOAT_LABEL(lit_2312))
var1 = param_3;
while (!var2 && var1 < param_3) {
(*param_4)++;
if (*param_4 < 0x1e)
break;
if ((param_0 * var1 * FLOAT_LABEL(lit_2308) / FLOAT_LABEL(lit_2309)) < (field_0x114.mWidth - FLOAT_LABEL(lit_2313)))
var1 += FLOAT_LABEL(lit_2312);
break;
}
*param_1 = var1;
while (!var2 && var1 < param_3) {
(*param_4)++;
if (*param_4 < 0x1e)
break;
if ((param_0 * var1 * FLOAT_LABEL(lit_2308) / FLOAT_LABEL(lit_2309)) <
(field_0x114.mWidth - FLOAT_LABEL(lit_2313)))
var1 += FLOAT_LABEL(lit_2312);
break;
}
*param_1 = var1;
}
#else
#pragma push
@@ -294,7 +296,8 @@ void JUTProcBar::drawProcessBar() {
}
int r29 = 16666;
if (JUTGetVideoManager() &&
((JUTGetVideoManager()->getRenderMode()->vi_tv_mode >> 2) & 0x0f) == 1) {
((JUTGetVideoManager()->getRenderMode()->vi_tv_mode >> 2) & 0x0f) == 1)
{
r29 = 20000;
}
static int cnt = 0;