Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SBAR: Avoid GA overflow when carrying regeneration rune. #652

Merged
merged 1 commit into from
Jul 10, 2022
Merged

SBAR: Avoid GA overflow when carrying regeneration rune. #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions help_variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6787,6 +6787,10 @@
"group-id": "19",
"type": ""
},
"hud_bar_armor_color_ga_over": {
"group-id": "19",
"type": ""
},
"hud_bar_armor_color_noarmor": {
"group-id": "19",
"type": ""
Expand Down
13 changes: 10 additions & 3 deletions hud_armor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ static void SCR_HUD_DrawArmorDamage(hud_t *hud)

void SCR_HUD_DrawBarArmor(hud_t *hud)
{
static cvar_t *width = NULL, *height, *direction, *color_noarmor, *color_ga, *color_ya, *color_ra, *color_unnatural;
static cvar_t *width = NULL, *height, *direction, *color_noarmor, *color_ga, *color_ga_over, *color_ya, *color_ra, *color_unnatural;
int x, y;
int armor = HUD_Stats(STAT_ARMOR);
qbool alive = cl.stats[STAT_HEALTH] > 0;
Expand All @@ -185,6 +185,7 @@ void SCR_HUD_DrawBarArmor(hud_t *hud)
height = HUD_FindVar(hud, "height");
direction = HUD_FindVar(hud, "direction");
color_noarmor = HUD_FindVar(hud, "color_noarmor");
color_ga_over = HUD_FindVar(hud, "color_ga_over");
color_ga = HUD_FindVar(hud, "color_ga");
color_ya = HUD_FindVar(hud, "color_ya");
color_ra = HUD_FindVar(hud, "color_ra");
Expand All @@ -208,8 +209,13 @@ void SCR_HUD_DrawBarArmor(hud_t *hud)
SCR_HUD_DrawBar(direction->integer, armor, 150.0, color_ya->color, x, y, width->integer, height->integer);
}
else if (HUD_Stats(STAT_ITEMS) & IT_ARMOR1 && alive) {
SCR_HUD_DrawBar(direction->integer, 100, 100.0, color_noarmor->color, x, y, width->integer, height->integer);
SCR_HUD_DrawBar(direction->integer, armor, 100.0, color_ga->color, x, y, width->integer, height->integer);
if (armor > 100) {
SCR_HUD_DrawBar(direction->integer, 100, 100.0, color_ga->color, x, y, width->integer, height->integer);
SCR_HUD_DrawBar(direction->integer, armor - 100.0, 100.0, color_ga_over->color, x, y, width->integer, height->integer);
} else {
SCR_HUD_DrawBar(direction->integer, 100, 100.0, color_noarmor->color, x, y, width->integer, height->integer);
SCR_HUD_DrawBar(direction->integer, armor, 100.0, color_ga->color, x, y, width->integer, height->integer);
}
}
else {
SCR_HUD_DrawBar(direction->integer, 100, 100.0, color_noarmor->color, x, y, width->integer, height->integer);
Expand Down Expand Up @@ -267,6 +273,7 @@ void Armor_HudInit(void)
"width", "64",
"direction", "1",
"color_noarmor", "128 128 128 64",
"color_ga_over", "48 160 0 128",
"color_ga", "32 128 0 128",
"color_ya", "192 128 0 128",
"color_ra", "128 0 0 128",
Expand Down
8 changes: 7 additions & 1 deletion hud_frags.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ static void Frags_DrawHorizontalHealthBar(player_info_t* info, int x, int y, int
static cvar_t* health_color_twomega = NULL;
static cvar_t* health_color_unnatural = NULL;
static cvar_t* armor_color_noarmor = NULL;
static cvar_t* armor_color_ga_over = NULL;
static cvar_t* armor_color_ga = NULL;
static cvar_t* armor_color_ya = NULL;
static cvar_t* armor_color_ra = NULL;
Expand Down Expand Up @@ -91,6 +92,7 @@ static void Frags_DrawHorizontalHealthBar(player_info_t* info, int x, int y, int
health_color_unnatural = Cvar_Find("hud_bar_health_color_unnatural");

armor_color_noarmor = Cvar_Find("hud_bar_armor_color_noarmor");
armor_color_ga_over = Cvar_Find("hud_bar_armor_color_ga_over");
armor_color_ga = Cvar_Find("hud_bar_armor_color_ga");
armor_color_ya = Cvar_Find("hud_bar_armor_color_ya");
armor_color_ra = Cvar_Find("hud_bar_armor_color_ra");
Expand Down Expand Up @@ -123,7 +125,11 @@ static void Frags_DrawHorizontalHealthBar(player_info_t* info, int x, int y, int
max_armor = 150;
}
else if (items & IT_ARMOR1 && true_health >= 1) {
armor_color = RGBAVECT_TO_COLOR(armor_color_ga->color);
if (armor > 100) {
armor_color = RGBAVECT_TO_COLOR(armor_color_ga_over->color);
} else {
armor_color = RGBAVECT_TO_COLOR(armor_color_ga->color);
}
max_armor = 100;
}

Expand Down