OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed AT_GAME_SET(PowerInvulnerable) due to the problems it caused. The two

Browse source 
occurences in the code that depended on it were changed accordingly.
  Invulnerability colormaps are now being set by the items exclusively.
- Changed many checks for the friendly Minotaur to a new flag MF5_SUMMONEDMONSTER
  so that it can hopefully be generalized to be usable elsewhere later.
- Added Gez's submission for converting the Minotaur to DECORATE.


SVN r1120 (trunk)
This commit is contained in:
Christoph Oelckers 2008-08-06 19:25:59 +00:00
commit bf281a4372
14 changed files with 18821 additions and 18824 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/p_mobj.cpp
View file

@ -796,11 +796,14 @@ AInventory *AActor::GiveInventoryType (const PClass *type)
{
AInventory *item;
item = static_cast<AInventory *>(Spawn (type, 0,0,0, NO_REPLACE));
if (!item->TryPickup (this))
if (type != NULL)
{
item->Destroy ();
return NULL;
item = static_cast<AInventory *>(Spawn (type, 0,0,0, NO_REPLACE));
if (!item->TryPickup (this))
{
item->Destroy ();
return NULL;
}
}
return item;
}
@ -2439,8 +2442,7 @@ bool AActor::IsOkayToAttack (AActor *link)
{
return false;
}
if ((link->IsKindOf (RUNTIME_CLASS(AMinotaur))) &&
(link->tracer == this))
if ((link->flags5 & MF5_SUMMONEDMONSTER) && (link->tracer == this))
{
return false;
}