From 7795e146fa36959426539001a0176479146103c9 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Fri, 12 Aug 2016 15:56:07 +0100 Subject: [PATCH 1/2] Two seperate single-line fixes, both concerning the end of NiGHTS maps. * The NiGHTS drone had a single tic of visibility when you hit the goal, which is evident stepping frame by frame through http://gfycat.com/ComplicatedComposedAoudad (the contents of which may or may not make it into 2.2). * When completing a NiGHTS stage with a non-zero link, the link could flash up in the final few tics before the fade to black. This just checks for player->exiting to make sure it shouldn't be shown. --- src/p_mobj.c | 1 + src/st_stuff.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 62dee0a6..000022b1 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6931,6 +6931,7 @@ void P_MobjThinker(mobj_t *mobj) { mobj->flags &= ~MF_NOGRAVITY; P_SetMobjState(mobj, S_NIGHTSDRONE1); + mobj->flags2 |= MF2_DONTDRAW; } } else if (mobj->tracer && mobj->tracer->player) diff --git a/src/st_stuff.c b/src/st_stuff.c index aac6b09d..5b208d33 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -974,8 +974,8 @@ static void ST_drawNiGHTSHUD(void) if (cv_debug & DBG_NIGHTSBASIC) minlink = 0; - // Cheap hack: don't display when the score is showing - if (stplyr->texttimer && stplyr->textvar == 4) + // Cheap hack: don't display when the score is showing or you're exiting a map + if ((stplyr->exiting) || (stplyr->texttimer && stplyr->textvar == 4)) minlink = INT32_MAX; if (G_IsSpecialStage(gamemap)) From 104fc8ba98db280b3681198a52f693a8fe3d3e1d Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Fri, 12 Aug 2016 16:01:03 +0100 Subject: [PATCH 2/2] Partially reverted on Inu's reccomendation. --- src/st_stuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 5b208d33..06639d4f 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -974,8 +974,8 @@ static void ST_drawNiGHTSHUD(void) if (cv_debug & DBG_NIGHTSBASIC) minlink = 0; - // Cheap hack: don't display when the score is showing or you're exiting a map - if ((stplyr->exiting) || (stplyr->texttimer && stplyr->textvar == 4)) + // Cheap hack: don't display when the score is showing (it popping up for a split second when exiting a map is intentional) + if (stplyr->texttimer && stplyr->textvar == 4) minlink = INT32_MAX; if (G_IsSpecialStage(gamemap))