- Exported AActor::Grind to ZScript.

src/actor.h

@@ -814,7 +814,8 @@ public:
 	virtual bool Massacre ();
 
 	// Transforms the actor into a finely-ground paste
-	virtual bool Grind(bool items);
+	bool Grind(bool items);
+	bool CallGrind(bool items);
 
 	// Get this actor's team
 	int GetTeam();

src/g_inventory/a_pickups.cpp

@@ -173,33 +173,6 @@ void AInventory::MarkPrecacheSounds() const
 	PickupSound.MarkUsed();
 }
 
-//===========================================================================
-//
-// AInventory :: Grind
-//
-//===========================================================================
-
-bool AInventory::Grind(bool items)
-{
-	// Does this grind request even care about items?
-	if (!items)
-	{
-		return false;
-	}
-	// Dropped items are normally destroyed by crushers. Set the DONTGIB flag,
-	// and they'll act like corpses with it set and be immune to crushers.
-	if (flags & MF_DROPPED)
-	{
-		if (!(flags3 & MF3_DONTGIB))
-		{
-			Destroy();
-		}
-		return false;
-	}
-	// Non-dropped items call the super method for compatibility.
-	return Super::Grind(items);
-}
-
 //===========================================================================
 //
 // AInventory :: BecomeItem

src/g_inventory/a_pickups.h

@@ -76,7 +76,6 @@ public:
 	virtual void OnDestroy() override;
 	virtual void Tick() override;
 	virtual bool Massacre() override;
-	virtual bool Grind(bool items) override;
 
 	bool CallTryPickup(AActor *toucher, AActor **toucher_return = NULL);	// Wrapper for script function.
 

src/p_map.cpp

@@ -6485,7 +6485,7 @@ void P_FindBelowIntersectors(AActor *actor)
 
 void P_DoCrunch(AActor *thing, FChangePosition *cpos)
 {
-	if (!(thing && thing->Grind(true) && cpos)) return;
+	if (!(thing && thing->CallGrind(true) && cpos)) return;
 	cpos->nofit = true;
 
 	if ((cpos->crushchange > 0) && !(level.maptime & 3))

src/p_mobj.cpp

@@ -1903,6 +1903,26 @@ bool AActor::Grind(bool items)
 	return true;
 }
 
+DEFINE_ACTION_FUNCTION(AActor, Grind)
+{
+	PARAM_SELF_PROLOGUE(AActor);
+	PARAM_BOOL(items);
+	ACTION_RETURN_BOOL(self->Grind(items));
+}
+
+bool AActor::CallGrind(bool items)
+{
+	IFVIRTUAL(AActor, Grind)
+	{
+		VMValue params[] = { (DObject*)this, items };
+		int retv;
+		VMReturn ret(&retv);
+		VMCall(func, params, 2, &ret, 1);
+		return !!retv;
+	}
+	return Grind(items);
+}
+
 //============================================================================
 //
 // AActor :: Massacre

src/po_man.cpp

@@ -869,7 +869,7 @@ void FPolyObj::ThrustMobj (AActor *actor, side_t *side)
 			P_TraceBleed (newdam > 0 ? newdam : crush, actor);
 		}
 	}
-	if (level.flags2 & LEVEL2_POLYGRIND) actor->Grind(false); // crush corpses that get caught in a polyobject's way
+	if (level.flags2 & LEVEL2_POLYGRIND) actor->CallGrind(false); // crush corpses that get caught in a polyobject's way
 }
 
 //==========================================================================

wadsrc/static/zscript/actor.txt

@@ -577,6 +577,7 @@ class Actor : Thinker native
 	native void ClearCounters();
 	native bool GiveBody (int num, int max=0);
 	native bool HitFloor();
+	native virtual bool Grind(bool items);
 	native clearscope bool isTeammate(Actor other) const;
 	native clearscope int PlayerNumber() const;
 	native void SetFriendPlayer(PlayerInfo player);

wadsrc/static/zscript/inventory/inventory.txt

@@ -145,6 +145,32 @@ class Inventory : Actor native
 		}
 	}
 
+	//===========================================================================
+	//
+	// AInventory :: Grind
+	//
+	//===========================================================================
+
+	override bool Grind(bool items)
+	{
+		// Does this grind request even care about items?
+		if (!items)
+		{
+			return false;
+		}
+		// Dropped items are normally destroyed by crushers. Set the DONTGIB flag,
+		// and they'll act like corpses with it set and be immune to crushers.
+		if (bDropped)
+		{
+			if (!bDontGib)
+			{
+				Destroy();
+			}
+			return false;
+		}
+		// Non-dropped items call the super method for compatibility.
+		return Super.Grind(items);
+	}		
 
 	//===========================================================================
 	//