The ability to disable weapon rings, as heavily requested by Lat and Speedwagon for their high effort character .wads and selfishly also desired to make thokker less hacky.

This commit is contained in:
toasterbabe 2016-08-19 00:06:12 +01:00
parent fb8de61a81
commit 3d9fe7c899
3 changed files with 20 additions and 0 deletions

View file

@ -18,6 +18,9 @@ enum hud {
hud_time, hud_time,
hud_rings, hud_rings,
hud_lives, hud_lives,
// Match
hud_weaponrings,
hud_powerstones,
// NiGHTS mode // NiGHTS mode
hud_nightslink, hud_nightslink,
hud_nightsdrill, hud_nightsdrill,

View file

@ -44,6 +44,9 @@ static const char *const hud_disable_options[] = {
"rings", "rings",
"lives", "lives",
"weaponrings",
"powerstones",
"nightslink", "nightslink",
"nightsdrill", "nightsdrill",
"nightsrings", "nightsrings",

View file

@ -1385,6 +1385,10 @@ static void ST_drawMatchHUD(void)
if (G_TagGametype() && !(stplyr->pflags & PF_TAGIT)) if (G_TagGametype() && !(stplyr->pflags & PF_TAGIT))
return; return;
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_weaponrings)) {
#endif
if (stplyr->powers[pw_infinityring]) if (stplyr->powers[pw_infinityring])
ST_drawWeaponRing(pw_infinityring, 0, 0, offset, infinityring); ST_drawWeaponRing(pw_infinityring, 0, 0, offset, infinityring);
else if (stplyr->health > 1) else if (stplyr->health > 1)
@ -1408,6 +1412,12 @@ static void ST_drawMatchHUD(void)
offset += 20; offset += 20;
ST_drawWeaponRing(pw_railring, RW_RAIL, WEP_RAIL, offset, railring); ST_drawWeaponRing(pw_railring, RW_RAIL, WEP_RAIL, offset, railring);
#ifdef HAVE_BLUA
}
if (LUA_HudEnabled(hud_powerstones)) {
#endif
// Power Stones collected // Power Stones collected
offset = 136; // Used for Y now offset = 136; // Used for Y now
@ -1439,6 +1449,10 @@ static void ST_drawMatchHUD(void)
if (stplyr->powers[pw_emeralds] & EMERALD7) if (stplyr->powers[pw_emeralds] & EMERALD7)
V_DrawScaledPatch(28, STRINGY(offset), V_SNAPTOLEFT, tinyemeraldpics[6]); V_DrawScaledPatch(28, STRINGY(offset), V_SNAPTOLEFT, tinyemeraldpics[6]);
#ifdef HAVE_BLUA
}
#endif
} }
static inline void ST_drawRaceHUD(void) static inline void ST_drawRaceHUD(void)