[Minor] Change a human player condition (Phobos-developers#1265)

Co-authored-by: chaserli <[email protected]>
chaserli · Jun 1, 2024 · 4bc1cda · 4bc1cda
1 parent 98b4bb6
commit 4bc1cda
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/src/Ext/House/Hooks.cpp b/src/Ext/House/Hooks.cpp
@@ -246,6 +246,15 @@ DEFINE_HOOK(0x7015C9, TechnoClass_Captured_UpdateTracking, 0x6)
 
 		if (pConvertTo && pConvertTo->WhatAmI() == pType->WhatAmI())
 			TechnoExt::ConvertToType(pMe, pConvertTo);
+
+		for (auto& trail : pExt->LaserTrails)
+		{
+			if (trail.Type->IsHouseColor)
+				trail.CurrentColor = pNewOwner->LaserColor;
+		}
+
+		if (!I_am_human && You_are_human)
+			TechnoExt::ChangeOwnerMissionFix(pMe);
 	}
 
 	return 0;

diff --git a/src/Ext/Techno/Hooks.cpp b/src/Ext/Techno/Hooks.cpp
@@ -81,23 +81,6 @@ DEFINE_HOOK(0x6F42F7, TechnoClass_Init, 0x2)
 	return 0;
 }
 
-DEFINE_HOOK(0x4DBF13, FootClass_SetOwningHouse, 0x6)
-{
-	GET(FootClass* const, pThis, ESI);
-
-	auto pExt = TechnoExt::ExtMap.Find(pThis);
-	for (auto& trail : pExt->LaserTrails)
-	{
-		if (trail.Type->IsHouseColor)
-			trail.CurrentColor = pThis->Owner->LaserColor;
-	}
-
-	if (pThis->Owner->IsHumanPlayer)
-		TechnoExt::ChangeOwnerMissionFix(pThis);
-
-	return 0;
-}
-
 DEFINE_HOOK_AGAIN(0x7355C0, TechnoClass_Init_InitialStrength, 0x6) // UnitClass_Init
 DEFINE_HOOK_AGAIN(0x517D69, TechnoClass_Init_InitialStrength, 0x6) // InfantryClass_Init
 DEFINE_HOOK_AGAIN(0x442C7B, TechnoClass_Init_InitialStrength, 0x6) // BuildingClass_Init