lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Consider hide-and-seek as GTR_HIDEFROZEN

This commit is contained in:
Jaime Passos 2020-02-28 23:52:33 -03:00
parent d3ed5ad44f
commit 6fb5a6efb6
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_game.c
View File

@ -2085,7 +2085,7 @@ boolean G_Responder(event_t *ev)
&& players[displayplayer].ctfteam != players[consoleplayer].ctfteam) && players[displayplayer].ctfteam != players[consoleplayer].ctfteam)
continue; continue;
} }
else if (gametype == GT_HIDEANDSEEK) else if (gametyperules & GTR_HIDEFROZEN)
{ {
if (players[consoleplayer].pflags & PF_TAGIT) if (players[consoleplayer].pflags & PF_TAGIT)
continue; continue;

2
src/p_map.c
View File

@ -1613,7 +1613,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
} }
// Force solid players in hide and seek to avoid corner stacking. // 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) if (tmthing->player && thing->player)
{ {

5
src/st_stuff.c
View File

@ -2368,15 +2368,14 @@ static void ST_drawTextHUD(void)
else else
textHUDdraw(M_GetText("Flee before you are hunted!")) 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) if (!splitscreen && !donef12)
{ {
textHUDdraw(M_GetText("\x82""VIEWPOINT:""\x80 Switch view")) textHUDdraw(M_GetText("\x82""VIEWPOINT:""\x80 Switch view"))
donef12 = true; donef12 = true;
} }
if (gametyperules & GTR_HIDEFROZEN) textHUDdraw(M_GetText("You cannot move while hiding."))
textHUDdraw(M_GetText("You cannot move while hiding."))
} }
} }