zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Implement hostile coop for -FRIENDLY players.

Browse source
This commit is contained in:
Rachael Alexanderson 2017-03-10 14:00:58 -05:00
parent 786c4f01c8
commit ff3d3f13c8
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_enemy.cpp
View file

@ -250,9 +250,6 @@ void P_NoiseAlert (AActor *target, AActor *emitter, bool splash, double maxdist)
if (emitter == NULL)
return;
/*if (target != NULL && target->player && !(target->flags & MF_FRIENDLY))
return;*/
if (target != NULL && target->player && (target->player->cheats & CF_NOTARGET))
return;

2
src/p_mobj.cpp
View file

@ -7273,7 +7273,7 @@ bool AActor::IsTeammate (AActor *other)
}
else if (!deathmatch && player && other->player)
{
return true;
return (!((flags ^ other->flags) & MF_FRIENDLY));
}
else if (teamplay)
{