Fix ExtendedAircraftMissions may remove aircraft with team from map

CrimRecya · CrimRecya · commit 7ec5e7721ab1 · 2025-04-23T01:39:42.000+08:00
diff --git a/src/Ext/Aircraft/Hooks.cpp b/src/Ext/Aircraft/Hooks.cpp
@@ -543,7 +543,7 @@ DEFINE_HOOK(0x414D4D, AircraftClass_Update_ClearTargetIfNoAmmo, 0x6)
 // GreatestThreat: for all the mission that should let the aircraft auto select a target
 AbstractClass* __fastcall AircraftClass_GreatestThreat(AircraftClass* pThis, void* _, ThreatType threatType, CoordStruct* pSelectCoords, bool onlyTargetHouseEnemy)
 {
-	if (RulesExt::Global()->ExtendedAircraftMissions)
+	if (RulesExt::Global()->ExtendedAircraftMissions && !pThis->Team && pThis->Ammo && !pThis->Airstrike && !pThis->Spawned)
 	{
 		if (const auto pPrimaryWeapon = pThis->GetWeapon(0)->WeaponType)
 			threatType |= pPrimaryWeapon->AllowedThreats();

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ DEFINE_HOOK(0x414D4D, AircraftClass_Update_ClearTargetIfNoAmmo, 0x6)`
`543`	`543`	`// GreatestThreat: for all the mission that should let the aircraft auto select a target`
`544`	`544`	`AbstractClass* __fastcall AircraftClass_GreatestThreat(AircraftClass* pThis, void* _, ThreatType threatType, CoordStruct* pSelectCoords, bool onlyTargetHouseEnemy)`
`545`	`545`	`{`
`546`		`- if (RulesExt::Global()->ExtendedAircraftMissions)`
	`546`	`+ if (RulesExt::Global()->ExtendedAircraftMissions && !pThis->Team && pThis->Ammo && !pThis->Airstrike && !pThis->Spawned)`
`547`	`547`	`{`
`548`	`548`	`if (const auto pPrimaryWeapon = pThis->GetWeapon(0)->WeaponType)`
`549`	`549`	`threatType \|= pPrimaryWeapon->AllowedThreats();`