From 6fb5a6efb6306492713f9a3a46edbbe94bf961b4 Mon Sep 17 00:00:00 2001 From: Jaime Passos Date: Fri, 28 Feb 2020 23:52:33 -0300 Subject: [PATCH] Consider hide-and-seek as GTR_HIDEFROZEN --- src/g_game.c | 2 +- src/p_map.c | 2 +- src/st_stuff.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index c8b4757e3..33edae9bc 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2085,7 +2085,7 @@ boolean G_Responder(event_t *ev) && players[displayplayer].ctfteam != players[consoleplayer].ctfteam) continue; } - else if (gametype == GT_HIDEANDSEEK) + else if (gametyperules & GTR_HIDEFROZEN) { if (players[consoleplayer].pflags & PF_TAGIT) continue; diff --git a/src/p_map.c b/src/p_map.c index 966684818..15bd1111e 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -1613,7 +1613,7 @@ static boolean PIT_CheckThing(mobj_t *thing) } // Force solid players in hide and seek to avoid corner stacking. - if (cv_tailspickup.value && gametype != GT_HIDEANDSEEK) + if (cv_tailspickup.value && !(gametyperules & GTR_HIDEFROZEN)) { if (tmthing->player && thing->player) { diff --git a/src/st_stuff.c b/src/st_stuff.c index 6bc5b452c..49f586976 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -2368,15 +2368,14 @@ static void ST_drawTextHUD(void) else textHUDdraw(M_GetText("Flee before you are hunted!")) } - else if (gametype == GT_HIDEANDSEEK && !(stplyr->pflags & PF_TAGIT)) + else if ((gametyperules & GTR_HIDEFROZEN) && !(stplyr->pflags & PF_TAGIT)) { if (!splitscreen && !donef12) { textHUDdraw(M_GetText("\x82""VIEWPOINT:""\x80 Switch view")) donef12 = true; } - if (gametyperules & GTR_HIDEFROZEN) - textHUDdraw(M_GetText("You cannot move while hiding.")) + textHUDdraw(M_GetText("You cannot move while hiding.")) } }