Rewritten and fixed a hook

Phobos-developers · Nov 8, 2021 · fa97a03 · fa97a03
1 parent 5d14698
commit fa97a03
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/src/Ext/Techno/Hooks.Shield.cpp b/src/Ext/Techno/Hooks.Shield.cpp
@@ -121,24 +121,6 @@ DEFINE_HOOK(0x6F9E50, TechnoClass_AI_Shield, 0x5)
 	return 0;
 }
 
-// Ares-hook jmp to this offset
-DEFINE_HOOK(0x71A88D, TemporalClass_AI_Shield, 0x0)
-{
-	GET(TemporalClass*, pThis, ESI);
-	if (auto const pTarget = pThis->Target)
-	{
-		const auto pExt = TechnoExt::ExtMap.Find(pTarget);
-		if (const auto pShieldData = pExt->Shield.get())
-		{
-			if (pShieldData->IsAvailable())
-				pShieldData->AI_Temporal();
-		}
-	}
-
-	// Recovering vanilla instructions that were broken by a hook call
-	return R->EAX<int>() <= 0 ? 0x71A895 : 0x71AB08;
-}
-
 DEFINE_HOOK(0x6F6AC4, TechnoClass_Remove_Shield, 0x5)
 {
 	GET(TechnoClass*, pThis, ECX);

diff --git a/src/Ext/Techno/Hooks.cpp b/src/Ext/Techno/Hooks.cpp
@@ -151,4 +151,27 @@ DEFINE_HOOK(0x518505, InfantryClass_TakeDamage_NotHuman, 0x4)
 	pThis->PlayAnim(static_cast<Sequence>(resultSequence), true);
 
 	return 0x518515;
+}
+
+// Ares-hook jmp to this offset
+DEFINE_HOOK(0x71A88D, TemporalClass_AI_Shield, 0x0)
+{
+	GET(TemporalClass*, pThis, ESI);
+
+	// Shield logic
+	if (auto const pTarget = pThis->Target)
+	{
+		const auto pExt = TechnoExt::ExtMap.Find(pTarget);
+		if (const auto pShieldData = pExt->Shield.get())
+		{
+			if (pShieldData->IsAvailable())
+				pShieldData->AI_Temporal();
+		}
+	}
+
+	// Techno attachment logic
+	TechnoExt::AttachmentAI(pThis->Target);
+
+	// Recovering vanilla instructions that were broken by a hook call
+	return R->EAX<int>() <= 0 ? 0x71A895 : 0x71AB08;
 }