OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Monsters couldn't hurt other monsters of the same species if they

Browse source 
were supposed to hate them.
- Since I was editing the file anyway I added checks for Heretic's and Strife's
  damaging floor types to DCajunMaster::IsDangerous.
- Added a NULL pointer check to DCajunMaster::TurnToAng because a crash log
  indicated that this can happen.
- Fixed: Strife's energy pod contains 20 units when dropped by monsters.
  To achieve this I added an Ammo.DropAmount property because there are
  no other means to control this from inside a conversation script.

SVN r151 (trunk)
This commit is contained in:
Christoph Oelckers 2006-05-28 14:54:01 +00:00
commit fb31db860d
11 changed files with 61 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_map.cpp
View file

@ -987,11 +987,15 @@ BOOL PIT_CheckThing (AActor *thing)
}
if (thing->GetSpecies() == tmthing->target->GetSpecies())
{
// Don't hurt same species or any relative
// Don't hurt same species or any relative -
// but only if the target isn't one's hostile.
if (!thing->IsHostile (tmthing->target))
{
// But only if the target isn't one's hostile.
return false;
// Allow hurting monsters the shooter hates.
if (thing->tid == 0 || tmthing->target->tid != thing->tid)
{
return false;
}
}
}
}