mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-10-31 23:55:06 -04:00
Code Issues Projects Releases Wiki Activity

Add ability to move Hearts

Browse Source
This commit is contained in:
Baoulettes 2022-05-02 01:58:10 +02:00 committed by GitHub
parent f133017463
commit b6d28a7bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
soh/src/code/z_lifemeter.c
View File

@ -1,6 +1,11 @@
#include "global.h" #include "global.h"
#include "textures/parameter_static/parameter_static.h" #include "textures/parameter_static/parameter_static.h"
s16 Top_LM_Margin = 0;
s16 Left_LM_Margin = 0;
s16 Right_LM_Margin = 0;
s16 Bottom_LM_Margin = 0;
static s16 sHeartsPrimColors[3][3] = { static s16 sHeartsPrimColors[3][3] = {
{ HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B }, { HEARTS_PRIM_R, HEARTS_PRIM_G, HEARTS_PRIM_B },
{ HEARTS_BURN_PRIM_R, HEARTS_BURN_PRIM_G, HEARTS_BURN_PRIM_B }, // unused { HEARTS_BURN_PRIM_R, HEARTS_BURN_PRIM_G, HEARTS_BURN_PRIM_B }, // unused
@ -166,6 +171,18 @@ void HealthMeter_Update(GlobalContext* globalCtx) {
s16 gFactor; s16 gFactor;
s16 bFactor; s16 bFactor;
if (CVar_GetS32("gHUDMargins", 0) != 0) {
Top_LM_Margin = CVar_GetS32("gHUDMargin_T", 0);
Left_LM_Margin = CVar_GetS32("gHUDMargin_L", 0);
Right_LM_Margin = CVar_GetS32("gHUDMargin_R", 0);
Bottom_LM_Margin = CVar_GetS32("gHUDMargin_B", 0);
} else {
Top_LM_Margin = 0;
Left_LM_Margin = 0;
Right_LM_Margin = 0;
Bottom_LM_Margin = 0;
}
if (interfaceCtx) {} if (interfaceCtx) {}
if (interfaceCtx->unk_200 != 0) { if (interfaceCtx->unk_200 != 0) {
@ -357,8 +374,8 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
} }
curColorSet = -1; curColorSet = -1;
offsetY = 0.0f; offsetY = 0.0f+(Top_LM_Margin*-1);
offsetX = OTRGetDimensionFromLeftEdge(0.0f); offsetX = OTRGetDimensionFromLeftEdge(0.0f)+(Left_LM_Margin*-1);
for (i = 0; i < totalHeartCount; i++) { for (i = 0; i < totalHeartCount; i++) {
if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) { if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) {
@ -518,7 +535,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) {
offsetX += 10.0f; offsetX += 10.0f;
if (i == 9) { if (i == 9) {
offsetY += 10.0f; offsetY += 10.0f;
offsetX = OTRGetDimensionFromLeftEdge(0.0f); offsetX = OTRGetDimensionFromLeftEdge(0.0f)+(Left_LM_Margin*-1);
} }
} }