- fixed: Inventory items that have been modified with Dehacked to be monsters should not be killed by P_Massacre when being owned.

src/actor.h

@@ -807,7 +807,7 @@ public:
 	void ObtainInventory (AActor *other);
 
 	// Die. Now.
-	bool Massacre ();
+	virtual bool Massacre ();
 
 	// Transforms the actor into a finely-ground paste
 	virtual bool Grind(bool items);

src/g_inventory/a_pickups.cpp

@@ -154,6 +154,20 @@ void AInventory::Serialize(FSerializer &arc)
 		("droptime", DropTime, def->DropTime);
 }
 
+//===========================================================================
+//
+// AInventory :: Massacre
+//
+// This is a countermeasure for Dehacked modifications mainly.
+//
+//===========================================================================
+
+bool AInventory::Massacre()
+{
+	if (Owner == nullptr) return Super::Massacre();
+	return false;
+}
+
 //===========================================================================
 //
 // AInventory :: MarkPrecacheSounds

src/g_inventory/a_pickups.h

@@ -75,6 +75,7 @@ public:
 	virtual void MarkPrecacheSounds() const override;
 	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.