zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-18 10:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added CanTouchItem virtual.

Browse source 
- Allows an actor with +PICKUP flag to determine if it can pick up specific items or not.
This commit is contained in:
Major Cooke 2019-03-03 13:26:00 -06:00 committed by Christoph Oelckers
parent 0fb940632a
commit 6327734659
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wadsrc/static/zscript/actors/actor.zs
View file

@ -460,6 +460,15 @@ class Actor : Thinker native
native void Substitute(Actor replacement); native void Substitute(Actor replacement);
native ui void DisplayNameTag(); native ui void DisplayNameTag();
// Called by inventory items to see if this actor is capable of touching them.
// If true, the item will attempt to be picked up. Useful for things like
// allowing morphs to pick up limited items such as keys while preventing
// them from picking other items up.
virtual bool CanTouchItem(Inventory item)
{
return true;
}
// Called by PIT_CheckThing to check if two actors actually can collide. // Called by PIT_CheckThing to check if two actors actually can collide.
virtual bool CanCollideWith(Actor other, bool passive) virtual bool CanCollideWith(Actor other, bool passive)
{ {

3
wadsrc/static/zscript/actors/inventory/inventory.zs
View file

@ -768,6 +768,9 @@ class Inventory : Actor
bool localview = toucher.CheckLocalView(); bool localview = toucher.CheckLocalView();
if (!toucher.CanTouchItem(self))
return;
bool res; bool res;
[res, toucher] = CallTryPickup(toucher); [res, toucher] = CallTryPickup(toucher);
if (!res) return; if (!res) return;