Merge branch 'ctf-enemy-flag-sound' into 2122-version

This commit is contained in:
mazmazz 2018-12-25 00:27:08 -05:00
commit 73a67fc9f5

View file

@ -7274,6 +7274,8 @@ void P_MobjThinker(mobj_t *mobj)
// Assumedly in splitscreen players will be on opposing teams
if (players[consoleplayer].ctfteam == 1 || splitscreen)
S_StartSound(NULL, sfx_hoop1);
else if (players[consoleplayer].ctfteam == 2)
S_StartSound(NULL, sfx_hoop3);
redflag = flagmo;
}
@ -7285,6 +7287,8 @@ void P_MobjThinker(mobj_t *mobj)
// Assumedly in splitscreen players will be on opposing teams
if (players[consoleplayer].ctfteam == 2 || splitscreen)
S_StartSound(NULL, sfx_hoop1);
else if (players[consoleplayer].ctfteam == 1)
S_StartSound(NULL, sfx_hoop3);
blueflag = flagmo;
}