github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update var name

Browse source
This commit is contained in:
Baoulettes 2022-04-27 04:31:41 +02:00 • committed by GitHub
commit 68dada474f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
soh/src/code/z_lifemeter.c
View file

@ -143,16 +143,16 @@ void HealthMeter_Init(GlobalContext* globalCtx) {
sHeartsDDEnv[0][1] = sHeartsDDEnv[1][1] = HEARTS_DD_ENV_G; sHeartsDDEnv[0][1] = sHeartsDDEnv[1][1] = HEARTS_DD_ENV_G;
sHeartsDDEnv[0][2] = sHeartsDDEnv[1][2] = HEARTS_DD_ENV_B; sHeartsDDEnv[0][2] = sHeartsDDEnv[1][2] = HEARTS_DD_ENV_B;
if (CVar_GetS32("gCustomColors", 0) != 0) {//Load custom colors ! if (CVar_GetS32("gHudColors", 1) == 2) {//Load custom colors !
interfaceCtx->heartsPrimR[0] = CVar_GetInt("gCCHeartsPrimR", 220); interfaceCtx->heartsPrimR[0] = CVar_GetS32("gCCHeartsPrimR", 220);
interfaceCtx->heartsPrimG[0] = CVar_GetInt("gCCHeartsPrimG", 10); interfaceCtx->heartsPrimG[0] = CVar_GetS32("gCCHeartsPrimG", 10);
interfaceCtx->heartsPrimB[0] = CVar_GetInt("gCCHeartsPrimB", 10); interfaceCtx->heartsPrimB[0] = CVar_GetS32("gCCHeartsPrimB", 10);
interfaceCtx->heartsPrimR[1] = CVar_GetInt("gCCHeartsPrimR", 220); interfaceCtx->heartsPrimR[1] = CVar_GetS32("gCCHeartsPrimR", 220);
interfaceCtx->heartsPrimG[1] = CVar_GetInt("gCCHeartsPrimG", 10); interfaceCtx->heartsPrimG[1] = CVar_GetS32("gCCHeartsPrimG", 10);
interfaceCtx->heartsPrimB[1] = CVar_GetInt("gCCHeartsPrimB", 10); interfaceCtx->heartsPrimB[1] = CVar_GetS32("gCCHeartsPrimB", 10);
sHeartsDDPrim[0][0] = sHeartsDDPrim[1][0] = CVar_GetInt("gDDCCHeartsPrimR", 220); sHeartsDDPrim[0][0] = sHeartsDDPrim[1][0] = CVar_GetS32("gDDCCHeartsPrimR", 220);
sHeartsDDPrim[0][1] = sHeartsDDPrim[1][1] = CVar_GetInt("gDDCCHeartsPrimG", 10); sHeartsDDPrim[0][1] = sHeartsDDPrim[1][1] = CVar_GetS32("gDDCCHeartsPrimG", 10);
sHeartsDDPrim[0][2] = sHeartsDDPrim[1][2] = CVar_GetInt("gDDCCHeartsPrimB", 10); sHeartsDDPrim[0][2] = sHeartsDDPrim[1][2] = CVar_GetS32("gDDCCHeartsPrimB", 10);
} }
} }
@ -184,10 +184,10 @@ void HealthMeter_Update(GlobalContext* globalCtx) {
ddFactor = factor; ddFactor = factor;
if (CVar_GetS32("gCustomColors", 0) != 0) {//Required for runtime colors change. if (CVar_GetS32("gHudColors", 1) == 2) {//Required for runtime colors change.
interfaceCtx->heartsPrimR[0] = CVar_GetInt("gCCHeartsPrimR", 220); interfaceCtx->heartsPrimR[0] = CVar_GetS32("gCCHeartsPrimR", 220);
interfaceCtx->heartsPrimG[0] = CVar_GetInt("gCCHeartsPrimG", 10); interfaceCtx->heartsPrimG[0] = CVar_GetS32("gCCHeartsPrimG", 10);
interfaceCtx->heartsPrimB[0] = CVar_GetInt("gCCHeartsPrimB", 10); interfaceCtx->heartsPrimB[0] = CVar_GetS32("gCCHeartsPrimB", 10);
} else { } else {
interfaceCtx->heartsPrimR[0] = HEARTS_PRIM_R; interfaceCtx->heartsPrimR[0] = HEARTS_PRIM_R;
interfaceCtx->heartsPrimG[0] = HEARTS_PRIM_G; interfaceCtx->heartsPrimG[0] = HEARTS_PRIM_G;
@ -210,10 +210,10 @@ void HealthMeter_Update(GlobalContext* globalCtx) {
interfaceCtx->heartsEnvG[1] = sHeartsEnvColors[type][1]; interfaceCtx->heartsEnvG[1] = sHeartsEnvColors[type][1];
interfaceCtx->heartsEnvB[1] = sHeartsEnvColors[type][2]; 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) 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_GetInt("gCCHeartsPrimR", 220)) & 0xFF; interfaceCtx->beatingHeartPrim[0] = (u8)(rFactor + CVar_GetS32("gCCHeartsPrimR", 220)) & 0xFF;
interfaceCtx->beatingHeartPrim[1] = (u8)(gFactor + CVar_GetInt("gCCHeartsPrimG", 10)) & 0xFF; interfaceCtx->beatingHeartPrim[1] = (u8)(gFactor + CVar_GetS32("gCCHeartsPrimG", 10)) & 0xFF;
interfaceCtx->beatingHeartPrim[2] = (u8)(bFactor + CVar_GetInt("gCCHeartsPrimB", 10)) & 0xFF; interfaceCtx->beatingHeartPrim[2] = (u8)(bFactor + CVar_GetS32("gCCHeartsPrimB", 10)) & 0xFF;
} else { } else {
interfaceCtx->beatingHeartPrim[0] = (u8)(rFactor + HEARTS_PRIM_R) & 0xFF; interfaceCtx->beatingHeartPrim[0] = (u8)(rFactor + HEARTS_PRIM_R) & 0xFF;
interfaceCtx->beatingHeartPrim[1] = (u8)(gFactor + HEARTS_PRIM_G) & 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[1] = (u8)(gFactor + HEARTS_ENV_G) & 0xFF;
interfaceCtx->beatingHeartEnv[2] = (u8)(bFactor + HEARTS_ENV_B) & 0xFF; interfaceCtx->beatingHeartEnv[2] = (u8)(bFactor + HEARTS_ENV_B) & 0xFF;
if (CVar_GetS32("gCustomColors", 0) != 0) {//Same as abose (DD stand for Double Defense) if (CVar_GetS32("gHudColors", 1) == 2) {//Same as abose (DD stand for Double Defense)
sHeartsDDPrim[0][0] = CVar_GetInt("gDDCCHeartsPrimR", 220); sHeartsDDPrim[0][0] = CVar_GetS32("gDDCCHeartsPrimR", 220);
sHeartsDDPrim[0][1] = CVar_GetInt("gDDCCHeartsPrimG", 0); sHeartsDDPrim[0][1] = CVar_GetS32("gDDCCHeartsPrimG", 0);
sHeartsDDPrim[0][2] = CVar_GetInt("gDDCCHeartsPrimB", 0); sHeartsDDPrim[0][2] = CVar_GetS32("gDDCCHeartsPrimB", 0);
} else { } else {
sHeartsDDPrim[0][0] = HEARTS_DD_PRIM_R; sHeartsDDPrim[0][0] = HEARTS_DD_PRIM_R;
sHeartsDDPrim[0][1] = HEARTS_DD_PRIM_G; sHeartsDDPrim[0][1] = HEARTS_DD_PRIM_G;
@ -256,10 +256,10 @@ void HealthMeter_Update(GlobalContext* globalCtx) {
gFactor = sHeartsDDPrimFactors[ddType][1] * ddFactor; gFactor = sHeartsDDPrimFactors[ddType][1] * ddFactor;
bFactor = sHeartsDDPrimFactors[ddType][2] * ddFactor; bFactor = sHeartsDDPrimFactors[ddType][2] * ddFactor;
if (CVar_GetS32("gCustomColors", 0) != 0) {//Since that in Update() runtime color change will work like that :) if (CVar_GetS32("gHudColors", 1) == 2) {//Since that in Update() runtime color change will work like that :)
sBeatingHeartsDDPrim[0] = (u8)(rFactor + CVar_GetInt("gDDCCHeartsPrimR", 220)) & 0xFF; sBeatingHeartsDDPrim[0] = (u8)(rFactor + CVar_GetS32("gDDCCHeartsPrimR", 220)) & 0xFF;
sBeatingHeartsDDPrim[1] = (u8)(gFactor + CVar_GetInt("gDDCCHeartsPrimG", 0)) & 0xFF; sBeatingHeartsDDPrim[1] = (u8)(gFactor + CVar_GetS32("gDDCCHeartsPrimG", 0)) & 0xFF;
sBeatingHeartsDDPrim[2] = (u8)(bFactor + CVar_GetInt("gDDCCHeartsPrimB", 0)) & 0xFF; sBeatingHeartsDDPrim[2] = (u8)(bFactor + CVar_GetS32("gDDCCHeartsPrimB", 0)) & 0xFF;
} else { } else {
sBeatingHeartsDDPrim[0] = (u8)(rFactor + HEARTS_DD_PRIM_R) & 0xFF; sBeatingHeartsDDPrim[0] = (u8)(rFactor + HEARTS_DD_PRIM_R) & 0xFF;
sBeatingHeartsDDPrim[1] = (u8)(gFactor + HEARTS_DD_PRIM_G) & 0xFF; sBeatingHeartsDDPrim[1] = (u8)(gFactor + HEARTS_DD_PRIM_G) & 0xFF;