OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added Gez's submission for inventory restrictions but changed the added checks to be in the main CallTryPickup function.

Browse source 
SVN r3296 (trunk)
This commit is contained in:
Christoph Oelckers 2011-09-23 08:23:51 +00:00
commit 3c47a30249
17 changed files with 158 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/g_shared/a_pickups.cpp
View file

@ -1266,13 +1266,29 @@ bool AInventory::TryPickup (AActor *&toucher)
//===========================================================================
//
// AInventory :: TryPickup
// AInventory :: TryPickupRestricted
//
//===========================================================================
bool AInventory::TryPickupRestricted (AActor *&toucher)
{
return false;
}
//===========================================================================
//
// AInventory :: CallTryPickup
//
//===========================================================================
bool AInventory::CallTryPickup (AActor *toucher, AActor **toucher_return)
{
bool res = TryPickup(toucher);
bool res;
if (CanPickup(toucher))
res = TryPickup(toucher);
else
res = TryPickupRestricted(toucher); // let an item decide for itself how it will handle this
// Morph items can change the toucher so we need an option to return this info.
if (toucher_return != NULL) *toucher_return = toucher;
@ -1288,6 +1304,40 @@ bool AInventory::CallTryPickup (AActor *toucher, AActor **toucher_return)
}
//===========================================================================
//
// AInventory :: CanPickup
//
//===========================================================================
bool AInventory::CanPickup (AActor *toucher)
{
if (!toucher)
return false;
FActorInfo *ai = GetClass()->ActorInfo;
// Is the item restricted to certain player classes?
if (ai->RestrictedToPlayerClass.Size() != 0)
{
for (unsigned i = 0; i < ai->RestrictedToPlayerClass.Size(); ++i)
{
if (toucher->IsKindOf(ai->RestrictedToPlayerClass[i]))
return true;
}
return false;
}
// Or is it forbidden to certain other classes?
else
{
for (unsigned i = 0; i < ai->ForbiddenToPlayerClass.Size(); ++i)
{
if (toucher->IsKindOf(ai->ForbiddenToPlayerClass[i]))
return false;
}
}
return true;
}
//===========================================================================
//
// CCMD printinv