From 68dada474f63b1f9c1defbe3ee46b60cc5278e7d Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Wed, 27 Apr 2022 04:31:41 +0200 Subject: [PATCH] update var name --- soh/src/code/z_lifemeter.c | 52 +++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/soh/src/code/z_lifemeter.c b/soh/src/code/z_lifemeter.c index 080fa74c7..37929f9cf 100644 --- a/soh/src/code/z_lifemeter.c +++ b/soh/src/code/z_lifemeter.c @@ -143,16 +143,16 @@ void HealthMeter_Init(GlobalContext* globalCtx) { sHeartsDDEnv[0][1] = sHeartsDDEnv[1][1] = HEARTS_DD_ENV_G; sHeartsDDEnv[0][2] = sHeartsDDEnv[1][2] = HEARTS_DD_ENV_B; - if (CVar_GetS32("gCustomColors", 0) != 0) {//Load custom colors ! - interfaceCtx->heartsPrimR[0] = CVar_GetInt("gCCHeartsPrimR", 220); - interfaceCtx->heartsPrimG[0] = CVar_GetInt("gCCHeartsPrimG", 10); - interfaceCtx->heartsPrimB[0] = CVar_GetInt("gCCHeartsPrimB", 10); - interfaceCtx->heartsPrimR[1] = CVar_GetInt("gCCHeartsPrimR", 220); - interfaceCtx->heartsPrimG[1] = CVar_GetInt("gCCHeartsPrimG", 10); - interfaceCtx->heartsPrimB[1] = CVar_GetInt("gCCHeartsPrimB", 10); - sHeartsDDPrim[0][0] = sHeartsDDPrim[1][0] = CVar_GetInt("gDDCCHeartsPrimR", 220); - sHeartsDDPrim[0][1] = sHeartsDDPrim[1][1] = CVar_GetInt("gDDCCHeartsPrimG", 10); - sHeartsDDPrim[0][2] = sHeartsDDPrim[1][2] = CVar_GetInt("gDDCCHeartsPrimB", 10); + if (CVar_GetS32("gHudColors", 1) == 2) {//Load custom colors ! + interfaceCtx->heartsPrimR[0] = CVar_GetS32("gCCHeartsPrimR", 220); + interfaceCtx->heartsPrimG[0] = CVar_GetS32("gCCHeartsPrimG", 10); + interfaceCtx->heartsPrimB[0] = CVar_GetS32("gCCHeartsPrimB", 10); + interfaceCtx->heartsPrimR[1] = CVar_GetS32("gCCHeartsPrimR", 220); + interfaceCtx->heartsPrimG[1] = CVar_GetS32("gCCHeartsPrimG", 10); + interfaceCtx->heartsPrimB[1] = CVar_GetS32("gCCHeartsPrimB", 10); + sHeartsDDPrim[0][0] = sHeartsDDPrim[1][0] = CVar_GetS32("gDDCCHeartsPrimR", 220); + sHeartsDDPrim[0][1] = sHeartsDDPrim[1][1] = CVar_GetS32("gDDCCHeartsPrimG", 10); + sHeartsDDPrim[0][2] = sHeartsDDPrim[1][2] = CVar_GetS32("gDDCCHeartsPrimB", 10); } } @@ -184,10 +184,10 @@ void HealthMeter_Update(GlobalContext* globalCtx) { ddFactor = factor; - if (CVar_GetS32("gCustomColors", 0) != 0) {//Required for runtime colors change. - interfaceCtx->heartsPrimR[0] = CVar_GetInt("gCCHeartsPrimR", 220); - interfaceCtx->heartsPrimG[0] = CVar_GetInt("gCCHeartsPrimG", 10); - interfaceCtx->heartsPrimB[0] = CVar_GetInt("gCCHeartsPrimB", 10); + if (CVar_GetS32("gHudColors", 1) == 2) {//Required for runtime colors change. + interfaceCtx->heartsPrimR[0] = CVar_GetS32("gCCHeartsPrimR", 220); + interfaceCtx->heartsPrimG[0] = CVar_GetS32("gCCHeartsPrimG", 10); + interfaceCtx->heartsPrimB[0] = CVar_GetS32("gCCHeartsPrimB", 10); } else { interfaceCtx->heartsPrimR[0] = HEARTS_PRIM_R; interfaceCtx->heartsPrimG[0] = HEARTS_PRIM_G; @@ -210,10 +210,10 @@ void HealthMeter_Update(GlobalContext* globalCtx) { interfaceCtx->heartsEnvG[1] = sHeartsEnvColors[type][1]; interfaceCtx->heartsEnvB[1] = sHeartsEnvColors[type][2]; - if (CVar_GetS32("gCustomColors", 0) != 0) {//Required for runtime colors change. (that when the heart grow and shrink color) - interfaceCtx->beatingHeartPrim[0] = (u8)(rFactor + CVar_GetInt("gCCHeartsPrimR", 220)) & 0xFF; - interfaceCtx->beatingHeartPrim[1] = (u8)(gFactor + CVar_GetInt("gCCHeartsPrimG", 10)) & 0xFF; - interfaceCtx->beatingHeartPrim[2] = (u8)(bFactor + CVar_GetInt("gCCHeartsPrimB", 10)) & 0xFF; + if (CVar_GetS32("gHudColors", 1) == 2) {//Required for runtime colors change. (that when the heart grow and shrink color) + interfaceCtx->beatingHeartPrim[0] = (u8)(rFactor + CVar_GetS32("gCCHeartsPrimR", 220)) & 0xFF; + interfaceCtx->beatingHeartPrim[1] = (u8)(gFactor + CVar_GetS32("gCCHeartsPrimG", 10)) & 0xFF; + interfaceCtx->beatingHeartPrim[2] = (u8)(bFactor + CVar_GetS32("gCCHeartsPrimB", 10)) & 0xFF; } else { interfaceCtx->beatingHeartPrim[0] = (u8)(rFactor + HEARTS_PRIM_R) & 0xFF; interfaceCtx->beatingHeartPrim[1] = (u8)(gFactor + HEARTS_PRIM_G) & 0xFF; @@ -230,10 +230,10 @@ void HealthMeter_Update(GlobalContext* globalCtx) { interfaceCtx->beatingHeartEnv[1] = (u8)(gFactor + HEARTS_ENV_G) & 0xFF; interfaceCtx->beatingHeartEnv[2] = (u8)(bFactor + HEARTS_ENV_B) & 0xFF; - if (CVar_GetS32("gCustomColors", 0) != 0) {//Same as abose (DD stand for Double Defense) - sHeartsDDPrim[0][0] = CVar_GetInt("gDDCCHeartsPrimR", 220); - sHeartsDDPrim[0][1] = CVar_GetInt("gDDCCHeartsPrimG", 0); - sHeartsDDPrim[0][2] = CVar_GetInt("gDDCCHeartsPrimB", 0); + if (CVar_GetS32("gHudColors", 1) == 2) {//Same as abose (DD stand for Double Defense) + sHeartsDDPrim[0][0] = CVar_GetS32("gDDCCHeartsPrimR", 220); + sHeartsDDPrim[0][1] = CVar_GetS32("gDDCCHeartsPrimG", 0); + sHeartsDDPrim[0][2] = CVar_GetS32("gDDCCHeartsPrimB", 0); } else { sHeartsDDPrim[0][0] = HEARTS_DD_PRIM_R; sHeartsDDPrim[0][1] = HEARTS_DD_PRIM_G; @@ -256,10 +256,10 @@ void HealthMeter_Update(GlobalContext* globalCtx) { gFactor = sHeartsDDPrimFactors[ddType][1] * ddFactor; bFactor = sHeartsDDPrimFactors[ddType][2] * ddFactor; - if (CVar_GetS32("gCustomColors", 0) != 0) {//Since that in Update() runtime color change will work like that :) - sBeatingHeartsDDPrim[0] = (u8)(rFactor + CVar_GetInt("gDDCCHeartsPrimR", 220)) & 0xFF; - sBeatingHeartsDDPrim[1] = (u8)(gFactor + CVar_GetInt("gDDCCHeartsPrimG", 0)) & 0xFF; - sBeatingHeartsDDPrim[2] = (u8)(bFactor + CVar_GetInt("gDDCCHeartsPrimB", 0)) & 0xFF; + if (CVar_GetS32("gHudColors", 1) == 2) {//Since that in Update() runtime color change will work like that :) + sBeatingHeartsDDPrim[0] = (u8)(rFactor + CVar_GetS32("gDDCCHeartsPrimR", 220)) & 0xFF; + sBeatingHeartsDDPrim[1] = (u8)(gFactor + CVar_GetS32("gDDCCHeartsPrimG", 0)) & 0xFF; + sBeatingHeartsDDPrim[2] = (u8)(bFactor + CVar_GetS32("gDDCCHeartsPrimB", 0)) & 0xFF; } else { sBeatingHeartsDDPrim[0] = (u8)(rFactor + HEARTS_DD_PRIM_R) & 0xFF; sBeatingHeartsDDPrim[1] = (u8)(gFactor + HEARTS_DD_PRIM_G) & 0xFF;