fix with b81a1dd that broke DeployedCrushable

NetsuNegi · NetsuNegi · commit 47475624da72 · 2026-06-26T22:55:53.000+08:00
diff --git a/src/Ext/Infantry/Hooks.cpp b/src/Ext/Infantry/Hooks.cpp
@@ -16,8 +16,8 @@ DEFINE_HOOK(0x51B2BD, InfantryClass_UpdateTarget_IsControlledByHuman, 0x6)
 DEFINE_HOOK(0x520B3E, InfantryClass_DoingAI_DeployConvert_Deploy, 0x6)
 {
 	GET(InfantryClass*, pThis, ESI);
-	auto const pTypeExt = TechnoTypeExt::ExtMap.Find(pThis->Type);
 	auto const pExt = TechnoExt::ExtMap.Find(pThis);
+	auto const pTypeExt = pExt->TypeExtData;
 
 	if (pTypeExt->Convert_Deploy && !pExt->HasDeployConverted)
 	{
@@ -26,15 +26,15 @@ DEFINE_HOOK(0x520B3E, InfantryClass_DoingAI_DeployConvert_Deploy, 0x6)
 		TechnoExt::ConvertToType(pThis, pTypeExt->Convert_Deploy);
 	}
 
-	return 0x520B44;
+	return 0;
 }
 
 // Undeploy case: DoAction(Ready)
 DEFINE_HOOK(0x520B99, InfantryClass_DoingAI_DeployConvert_Undeploy, 0x6)
 {
 	GET(InfantryClass*, pThis, ESI);
-	auto const pTypeExt = TechnoTypeExt::ExtMap.Find(pThis->Type);
 	auto const pExt = TechnoExt::ExtMap.Find(pThis);
+	auto const pTypeExt = pExt->TypeExtData;
 
 	if (pTypeExt->Convert_Undeploy && !pExt->HasUndeployConverted)
 	{
@@ -43,7 +43,7 @@ DEFINE_HOOK(0x520B99, InfantryClass_DoingAI_DeployConvert_Undeploy, 0x6)
 		TechnoExt::ConvertToType(pThis, pTypeExt->Convert_Undeploy);
 	}
 
-	return 0x520B9F;
+	return 0;
 }
 
 // Reset mark when Deploy/Undeploy

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ DEFINE_HOOK(0x51B2BD, InfantryClass_UpdateTarget_IsControlledByHuman, 0x6)`
`16`	`16`	`DEFINE_HOOK(0x520B3E, InfantryClass_DoingAI_DeployConvert_Deploy, 0x6)`
`17`	`17`	`{`
`18`	`18`	`GET(InfantryClass*, pThis, ESI);`
`19`		`- auto const pTypeExt = TechnoTypeExt::ExtMap.Find(pThis->Type);`
`20`	`19`	`auto const pExt = TechnoExt::ExtMap.Find(pThis);`
	`20`	`+ auto const pTypeExt = pExt->TypeExtData;`
`21`	`21`
`22`	`22`	`if (pTypeExt->Convert_Deploy && !pExt->HasDeployConverted)`
`23`	`23`	`{`
`@@ -26,15 +26,15 @@ DEFINE_HOOK(0x520B3E, InfantryClass_DoingAI_DeployConvert_Deploy, 0x6)`
`26`	`26`	`TechnoExt::ConvertToType(pThis, pTypeExt->Convert_Deploy);`
`27`	`27`	`}`
`28`	`28`
`29`		`- return 0x520B44;`
	`29`	`+ return 0;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// Undeploy case: DoAction(Ready)`
`33`	`33`	`DEFINE_HOOK(0x520B99, InfantryClass_DoingAI_DeployConvert_Undeploy, 0x6)`
`34`	`34`	`{`
`35`	`35`	`GET(InfantryClass*, pThis, ESI);`
`36`		`- auto const pTypeExt = TechnoTypeExt::ExtMap.Find(pThis->Type);`
`37`	`36`	`auto const pExt = TechnoExt::ExtMap.Find(pThis);`
	`37`	`+ auto const pTypeExt = pExt->TypeExtData;`
`38`	`38`
`39`	`39`	`if (pTypeExt->Convert_Undeploy && !pExt->HasUndeployConverted)`
`40`	`40`	`{`
`@@ -43,7 +43,7 @@ DEFINE_HOOK(0x520B99, InfantryClass_DoingAI_DeployConvert_Undeploy, 0x6)`
`43`	`43`	`TechnoExt::ConvertToType(pThis, pTypeExt->Convert_Undeploy);`
`44`	`44`	`}`
`45`	`45`
`46`		`- return 0x520B9F;`
	`46`	`+ return 0;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Reset mark when Deploy/Undeploy`