Bandaid Fix

xr-lucy · xr-lucy · commit 9cb2777fe9dc · 2025-04-14T20:40:17.000+02:00
Prevent crash after death when wearing armor, as seen in #166
diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
@@ -2236,7 +2236,8 @@ void CActor::OnItemDrop(CInventoryItem* inventory_item, bool just_before_destroy
 	CCustomOutfit* outfit = smart_cast<CCustomOutfit*>(inventory_item);
 	if (outfit && inventory_item->m_ItemCurrPlace.type == eItemPlaceSlot)
 	{
-		outfit->ApplySkinModel(this, false, false);
+		if (!(just_before_destroy && psDeviceFlags.test(rsDisableObjectsAsCrows)))
+			outfit->ApplySkinModel(this, false, false);
 	}
 
 	CWeapon* weapon = smart_cast<CWeapon*>(inventory_item);

Original file line number	Diff line number	Diff line change
`@@ -2236,7 +2236,8 @@ void CActor::OnItemDrop(CInventoryItem* inventory_item, bool just_before_destroy`
`2236`	`2236`	`CCustomOutfit* outfit = smart_cast<CCustomOutfit*>(inventory_item);`
`2237`	`2237`	`if (outfit && inventory_item->m_ItemCurrPlace.type == eItemPlaceSlot)`
`2238`	`2238`	`{`
`2239`		`- outfit->ApplySkinModel(this, false, false);`
	`2239`	`+ if (!(just_before_destroy && psDeviceFlags.test(rsDisableObjectsAsCrows)))`
	`2240`	`+ outfit->ApplySkinModel(this, false, false);`
`2240`	`2241`	`}`
`2241`	`2242`
`2242`	`2243`	`CWeapon* weapon = smart_cast<CWeapon*>(inventory_item);`