OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: AMageStaffFX2::IsOkayToAttack() / A_MStaffAttack aimed at friendlies.

Browse source 
- Added kill count awareness to A_ChangeFlag.
- P_NightmareRespawn() now clears the MTF_AMBUSH flag, so respawned monsters
  aren't dormant (since there would be no way to activate them, and they
  were certainly not dormant when they died).


SVN r1287 (trunk)
This commit is contained in:
Randy Heit 2008-11-14 23:12:15 +00:00
commit 183b765cf2
7 changed files with 52 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/p_mobj.cpp
View file

@ -2184,7 +2184,7 @@ void P_NightmareRespawn (AActor *mobj)
mo->SpawnPoint[1] = mobj->SpawnPoint[1];
mo->SpawnPoint[2] = mobj->SpawnPoint[2];
mo->SpawnAngle = mobj->SpawnAngle;
mo->SpawnFlags = mobj->SpawnFlags;
mo->SpawnFlags = mobj->SpawnFlags & ~MTF_DORMANT; // It wasn't dormant when it died, so it's not dormant now, either.
mo->angle = ANG45 * (mobj->SpawnAngle/45);
mo->HandleSpawnFlags ();
@ -2403,14 +2403,17 @@ bool AActor::IsOkayToAttack (AActor *link)
{
if (player) // Minotaur looking around player
{
if ((link->flags3 & MF3_ISMONSTER) ||
(link->player && (link != this)))
if ((link->flags3 & MF3_ISMONSTER) || (link->player && (link != this)))
{
if (!(link->flags&MF_SHOOTABLE))
if (IsFriend(link))
{
return false;
}
if (link->flags2&MF2_DORMANT)
if (!(link->flags & MF_SHOOTABLE))
{
return false;
}
if (link->flags2 & MF2_DORMANT)
{
return false;
}