Fixup to issues from merging

Starkku · Starkku · commit 4e5b6a67a313 · 2026-01-28T14:37:19.000+02:00
diff --git a/src/Ext/Anim/Hooks.AnimCreateUnit.cpp b/src/Ext/Anim/Hooks.AnimCreateUnit.cpp
@@ -15,7 +15,7 @@
 DEFINE_HOOK(0x737F6D, UnitClass_TakeDamage_Destroy, 0x7)
 {
 	GET(UnitClass* const, pThis, ESI);
-	REF_STACK(args_ReceiveDamage const, Receivedamageargs, STACK_OFFSET(0x44, 0x4));
+	REF_STACK(args_ReceiveDamage const, receiveDamageArgs, STACK_OFFSET(0x44, 0x4));
 
 	R->ECX(R->ESI());
 	TechnoExt::ExtMap.Find(pThis)->ReceiveDamage = true;
diff --git a/src/Ext/Anim/Hooks.cpp b/src/Ext/Anim/Hooks.cpp
@@ -130,7 +130,7 @@ DEFINE_HOOK(0x42453E, AnimClass_AI_Damage, 0x6)
 
 	if (pTypeExt->Weapon)
 	{
-		WeaponTypeExt::DetonateAt(pTypeExt->Weapon, pThis->GetCoords(), pInvoker, appliedDamage, pOwner, pOwnerObject);
+		WeaponTypeExt::DetonateAt(pTypeExt->Weapon, pThis->GetCoords(), pInvoker, appliedDamage, pOwner, pThis->OwnerObject);
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`DEFINE_HOOK(0x737F6D, UnitClass_TakeDamage_Destroy, 0x7)`
`16`	`16`	`{`
`17`	`17`	`GET(UnitClass* const, pThis, ESI);`
`18`		`- REF_STACK(args_ReceiveDamage const, Receivedamageargs, STACK_OFFSET(0x44, 0x4));`
	`18`	`+ REF_STACK(args_ReceiveDamage const, receiveDamageArgs, STACK_OFFSET(0x44, 0x4));`
`19`	`19`
`20`	`20`	`R->ECX(R->ESI());`
`21`	`21`	`TechnoExt::ExtMap.Find(pThis)->ReceiveDamage = true;`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ DEFINE_HOOK(0x42453E, AnimClass_AI_Damage, 0x6)`
`130`	`130`
`131`	`131`	`if (pTypeExt->Weapon)`
`132`	`132`	`{`
`133`		`- WeaponTypeExt::DetonateAt(pTypeExt->Weapon, pThis->GetCoords(), pInvoker, appliedDamage, pOwner, pOwnerObject);`
	`133`	`+ WeaponTypeExt::DetonateAt(pTypeExt->Weapon, pThis->GetCoords(), pInvoker, appliedDamage, pOwner, pThis->OwnerObject);`
`134`	`134`	`}`
`135`	`135`	`else`
`136`	`136`	`{`