mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-22 03:12:00 -04:00
Merge pull request #1450 from fabiangreffrath/animated_counts
rename Smooth to Animated Health/Armor Count
This commit is contained in:
commit
2787af02ef
@ -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"}},
|
||||
{"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,
|
||||
|
||||
|
@ -2609,10 +2609,10 @@ default_t defaults[] = {
|
||||
},
|
||||
|
||||
{ // [Alaux]
|
||||
"smooth_counts",
|
||||
(config_t *) &smooth_counts, NULL,
|
||||
"hud_animated_counts",
|
||||
(config_t *) &hud_animated_counts, NULL,
|
||||
{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
|
||||
|
@ -243,7 +243,7 @@ static patch_t *arms[6][2];
|
||||
static st_number_t w_ready;
|
||||
|
||||
// [Alaux]
|
||||
int smooth_counts;
|
||||
int hud_animated_counts;
|
||||
int st_health = 100;
|
||||
int st_armor = 0;
|
||||
|
||||
@ -746,7 +746,7 @@ static int SmoothCount(int shownval, int realval)
|
||||
{
|
||||
int step = realval - shownval;
|
||||
|
||||
if (!smooth_counts || !step)
|
||||
if (!hud_animated_counts || !step)
|
||||
{
|
||||
return realval;
|
||||
}
|
||||
|
@ -60,7 +60,7 @@ void ST_InitRes(void);
|
||||
// killough 5/2/98: moved from m_misc.c:
|
||||
|
||||
// [Alaux]
|
||||
extern int smooth_counts;
|
||||
extern int hud_animated_counts;
|
||||
extern int st_health;
|
||||
extern int st_armor;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user