From db22d503a4e6931a4773146ca95d9f3e11f58504 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Sun, 19 Jan 2020 21:55:08 -0300
Subject: [PATCH] HUD visual indicator + property fix
---
src/info.c | 2 +-
src/st_stuff.c | 24 +++++++++++++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/info.c b/src/info.c
index 2947cd6242..1ca68eda6f 100644
--- a/src/info.c
+++ b/src/info.c
@@ -18022,7 +18022,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16, // mass
0, // damage
sfx_None, // activesound
- MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags
+ MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
S_NULL // raisestate
},
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 9c9c80164a..d7e050b5b5 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -128,6 +128,7 @@ static patch_t *minus5sec;
static patch_t *minicaps;
static patch_t *gotrflag;
static patch_t *gotbflag;
+static patch_t *fnshico;
static boolean facefreed[MAXPLAYERS];
@@ -310,6 +311,7 @@ void ST_LoadGraphics(void)
bmatcico = W_CachePatchName("BMATCICO", PU_HUDGFX);
gotrflag = W_CachePatchName("GOTRFLAG", PU_HUDGFX);
gotbflag = W_CachePatchName("GOTBFLAG", PU_HUDGFX);
+ fnshico = W_CachePatchName("FNSHICO", PU_HUDGFX);
nonicon = W_CachePatchName("NONICON", PU_HUDGFX);
nonicon2 = W_CachePatchName("NONICON2", PU_HUDGFX);
@@ -1432,7 +1434,7 @@ static void ST_drawPowerupHUD(void)
UINT16 invulntime = 0;
INT32 offs = hudinfo[HUD_POWERUPS].x;
const UINT8 q = ((splitscreen && stplyr == &players[secondarydisplayplayer]) ? 1 : 0);
- static INT32 flagoffs[2] = {0, 0}, shieldoffs[2] = {0, 0};
+ static INT32 flagoffs[2] = {0, 0}, shieldoffs[2] = {0, 0}, finishoffs[2] = {0, 0};
#define ICONSEP (16+4) // matches weapon rings HUD
if (F_GetPromptHideHud(hudinfo[HUD_POWERUPS].y))
@@ -1440,6 +1442,26 @@ static void ST_drawPowerupHUD(void)
if (stplyr->spectator || stplyr->playerstate != PST_LIVE)
return;
+
+// ---------
+// Finish icon
+// ---------
+
+ // Let's have a power-like icon to represent finishing the level!
+ if (stplyr->pflags & PF_FINISHED && cv_exitmove.value)
+ {
+ finishoffs[q] = ICONSEP;
+ V_DrawSmallScaledPatch(offs, hudinfo[HUD_POWERUPS].y, V_PERPLAYER|hudinfo[HUD_POWERUPS].f|V_HUDTRANS, fnshico);
+ }
+ else if (finishoffs[q])
+ {
+ if (finishoffs[q] > 1)
+ finishoffs[q] = 2*finishoffs[q]/3;
+ else
+ finishoffs[q] = 0;
+ }
+
+ offs -= finishoffs[q];
// -------
// Shields
--
GitLab