AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-23 03:52:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1450 from fabiangreffrath/animated_counts

Browse Source 
rename Smooth to Animated Health/Armor Count
This commit is contained in:
Fabian Greffrath 2024-02-09 10:01:44 +01:00 committed by GitHub
commit 2787af02ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/m_menu.c
View File

@ -3241,7 +3241,7 @@ setup_menu_t stat_settings1[] = // Status Bar and HUD Settings screen
{"Backpack Shifts Ammo Color", S_YESNO, m_null, M_X, M_SPC, {"hud_backpack_thresholds"}}, {"Backpack Shifts Ammo Color", S_YESNO, m_null, M_X, M_SPC, {"hud_backpack_thresholds"}},
{"Armor Color Matches Type", S_YESNO, m_null, M_X, M_SPC, {"hud_armor_type"}}, {"Armor Color Matches Type", S_YESNO, m_null, M_X, M_SPC, {"hud_armor_type"}},
{"Smooth Health/Armor Count", S_YESNO, m_null, M_X, M_SPC, {"smooth_counts"}}, {"Animated Health/Armor Count", S_YESNO, m_null, M_X, M_SPC, {"hud_animated_counts"}},
MI_RESET, MI_RESET,

6
src/m_misc.c
View File

@ -2609,10 +2609,10 @@ default_t defaults[] = {
}, },
{ // [Alaux] { // [Alaux]
"smooth_counts", "hud_animated_counts",
(config_t *) &smooth_counts, NULL, (config_t *) &hud_animated_counts, NULL,
{0}, {0,1}, number, ss_stat, wad_yes, {0}, {0,1}, number, ss_stat, wad_yes,
"1 to enable smooth health/armor counts" "1 to enable animated health/armor counts"
}, },
{ // below is red { // below is red

4
src/st_stuff.c
View File

@ -243,7 +243,7 @@ static patch_t *arms[6][2];
static st_number_t w_ready; static st_number_t w_ready;
// [Alaux] // [Alaux]
int smooth_counts; int hud_animated_counts;
int st_health = 100; int st_health = 100;
int st_armor = 0; int st_armor = 0;
@ -746,7 +746,7 @@ static int SmoothCount(int shownval, int realval)
{ {
int step = realval - shownval; int step = realval - shownval;
if (!smooth_counts || !step) if (!hud_animated_counts || !step)
{ {
return realval; return realval;
} }

2
src/st_stuff.h
View File

@ -60,7 +60,7 @@ void ST_InitRes(void);
// killough 5/2/98: moved from m_misc.c: // killough 5/2/98: moved from m_misc.c:
// [Alaux] // [Alaux]
extern int smooth_counts; extern int hud_animated_counts;
extern int st_health; extern int st_health;
extern int st_armor; extern int st_armor;