Merge branch 'fixing-two-gametypes-noone-cares-about' into 'next'

Tag and H&S fix

Do I need to explain again? Tag and Hide & Seek got each other's suicide behavior by mistake, which this branch fixes of course.

See merge request !21
This commit is contained in:
Alam Ed Arias 2015-08-15 10:04:11 -04:00
commit 14bb811d25

View file

@ -1988,7 +1988,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
// allow them to try again, rather than sitting the whole thing out.
if (leveltime >= hidetime * TICRATE)
{
if (gametype == GT_HIDEANDSEEK)//suiciding in survivor makes you IT.
if (gametype == GT_TAG)//suiciding in survivor makes you IT.
{
target->player->pflags |= PF_TAGIT;
CONS_Printf(M_GetText("%s is now IT!\n"), player_names[target->player-players]); // Tell everyone who is it!