From 3d9fe7c899d7c63c91f8605fe6e503b68201540c Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Fri, 19 Aug 2016 00:06:12 +0100
Subject: [PATCH] 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.
---
src/lua_hud.h | 3 +++
src/lua_hudlib.c | 3 +++
src/st_stuff.c | 14 ++++++++++++++
3 files changed, 20 insertions(+)
diff --git a/src/lua_hud.h b/src/lua_hud.h
index 799ce2fbf..80e8ae03e 100644
--- a/src/lua_hud.h
+++ b/src/lua_hud.h
@@ -18,6 +18,9 @@ enum hud {
hud_time,
hud_rings,
hud_lives,
+ // Match
+ hud_weaponrings,
+ hud_powerstones,
// NiGHTS mode
hud_nightslink,
hud_nightsdrill,
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 31549afa7..7aadd9c0e 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -44,6 +44,9 @@ static const char *const hud_disable_options[] = {
"rings",
"lives",
+ "weaponrings",
+ "powerstones",
+
"nightslink",
"nightsdrill",
"nightsrings",
diff --git a/src/st_stuff.c b/src/st_stuff.c
index aac6b09d2..ca315ce27 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1385,6 +1385,10 @@ static void ST_drawMatchHUD(void)
if (G_TagGametype() && !(stplyr->pflags & PF_TAGIT))
return;
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_weaponrings)) {
+#endif
+
if (stplyr->powers[pw_infinityring])
ST_drawWeaponRing(pw_infinityring, 0, 0, offset, infinityring);
else if (stplyr->health > 1)
@@ -1408,6 +1412,12 @@ static void ST_drawMatchHUD(void)
offset += 20;
ST_drawWeaponRing(pw_railring, RW_RAIL, WEP_RAIL, offset, railring);
+#ifdef HAVE_BLUA
+ }
+
+ if (LUA_HudEnabled(hud_powerstones)) {
+#endif
+
// Power Stones collected
offset = 136; // Used for Y now
@@ -1439,6 +1449,10 @@ static void ST_drawMatchHUD(void)
if (stplyr->powers[pw_emeralds] & EMERALD7)
V_DrawScaledPatch(28, STRINGY(offset), V_SNAPTOLEFT, tinyemeraldpics[6]);
+
+#ifdef HAVE_BLUA
+ }
+#endif
}
static inline void ST_drawRaceHUD(void)
--
GitLab