OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: Classes inherited from PowerScanner didn't work anymore.

Browse source 
SVN r2368 (trunk)
This commit is contained in:
Christoph Oelckers 2010-06-13 10:11:50 +00:00
commit b2cef54d72
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/p_mobj.cpp
View file

@ -772,7 +772,7 @@ AInventory *AActor::DropInventory (AInventory *item)
//
//============================================================================
AInventory *AActor::FindInventory (const PClass *type)
AInventory *AActor::FindInventory (const PClass *type, bool subclass)
{
AInventory *item;
@ -781,9 +781,19 @@ AInventory *AActor::FindInventory (const PClass *type)
assert (type->ActorInfo != NULL);
for (item = Inventory; item != NULL; item = item->Inventory)
{
if (item->GetClass() == type)
if (!subclass)
{
break;
if (item->GetClass() == type)
{
break;
}
}
else
{
if (item->IsKindOf(type))
{
break;
}
}
}
return item;