zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 05:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: DesignatedTeams prevented monsters from hurting themselves in teamplay.

Browse source 
SVN r3508 (trunk)
This commit is contained in:
Braden Obrzut 2012-04-01 20:43:14 +00:00
parent 3e7473e51a
commit 1f6c6aafd9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_interaction.cpp
View file

@ -1092,7 +1092,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
// [RH] Avoid friendly fire if enabled // [RH] Avoid friendly fire if enabled
if (!(flags & DMG_FORCED) && source != NULL && if (!(flags & DMG_FORCED) && source != NULL &&
((player && player != source->player) || !player) && ((player && player != source->player) || (!player && target != source)) &&
target->IsTeammate (source)) target->IsTeammate (source))
{ {
if (player) if (player)