OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Copied railgun sound fix from Skulltag.

Browse source 
- Made infighting a level flag. The old method still exists but the level flags
  will take precedence if set.



SVN r532 (trunk)
This commit is contained in:
Christoph Oelckers 2007-05-20 11:08:36 +00:00
commit f4dcfad331
9 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_map.cpp
View file

@ -938,6 +938,7 @@ bool PIT_CheckThing (AActor *thing)
// [Graf Zahl] Why do I have the feeling that this didn't really work anymore now
// that ZDoom supports friendly monsters?
if (tmthing->target != NULL)
{
@ -950,7 +951,12 @@ bool PIT_CheckThing (AActor *thing)
// to harm / be harmed by anything.
if (!thing->player && !tmthing->target->player)
{
if (infighting < 0)
int infight;
if (level.flags & LEVEL_TOTALINFIGHTING) infight=1;
else if (level.flags & LEVEL_NOINFIGHTING) infight=-1;
else infight = infighting;
if (infight < 0)
{
// -1: Monsters cannot hurt each other, but make exceptions for
// friendliness and hate status.
@ -973,7 +979,7 @@ bool PIT_CheckThing (AActor *thing)
}
}
}
else if (infighting == 0)
else if (infight == 0)
{
// 0: Monsters cannot hurt same species except
// cases where they are clearly supposed to do that
@ -1001,7 +1007,7 @@ bool PIT_CheckThing (AActor *thing)
}
}
}
// else if (infighting==1) any shot hurts anything - no further tests
// else if (infight==1) any shot hurts anything - no further tests
}
}
if (!(thing->flags & MF_SHOOTABLE))