Fix issues

- Move ApproachTarget hooks to FootClass and make use of existing weapon range check results
- Unify locomotor behaviour - prevent locomotor processing on AssignDestination if immobilized
- Moved checking speed multipliers for zero speed to per frame processing due to necessity apply behaviour on all locomotors now
- Make TurretResponse code easier to read

Author: Starkku

src/Ext/Techno/Body.cpp

@@ -184,8 +184,9 @@ void TechnoExt::SyncInvulnerability(TechnoClass* pFrom, TechnoClass* pTo)
 
 double TechnoExt::GetCurrentSpeedMultiplier(FootClass* pThis)
 {
-	double houseMultiplier = 1.0;
+	auto const pExt = TechnoExt::ExtMap.Find(pThis);
 	auto const whatAmI = pThis->WhatAmI();
+	double houseMultiplier = 1.0;
 
 	if (whatAmI == AbstractType::Aircraft)
 		houseMultiplier = pThis->Owner->Type->SpeedAircraftMult;
@@ -194,8 +195,6 @@ double TechnoExt::GetCurrentSpeedMultiplier(FootClass* pThis)
 	else
 		houseMultiplier = pThis->Owner->Type->SpeedUnitsMult;
 
-	auto const pExt = TechnoExt::ExtMap.Find(pThis);
-
 	return pThis->SpeedMultiplier * houseMultiplier * pExt->AE.SpeedMultiplier *
 		(pThis->HasAbility(Ability::Faster) ? RulesClass::Instance->VeteranSpeed : 1.0);
 }
@@ -755,7 +754,7 @@ bool TechnoExt::CannotMove(FootClass* pThis, bool checkSpeedMultiplier)
 	if (pType->Speed == 0)
 		return true;
 
-	if (checkSpeedMultiplier && TechnoExt::GetCurrentSpeedMultiplier(pThis) <= 0.0)
+	if (checkSpeedMultiplier && TechnoExt::ExtMap.Find(pThis)->IsZeroSpeed)
 		return true;
 
 	auto landType = pThis->GetCell()->LandType;
@@ -1271,6 +1270,7 @@ void TechnoExt::ExtData::Serialize(T& Stm)
 		.Process(this->HoverShutdown)
 		.Process(this->LastTargetCrd)
 		.Process(this->LastTargetCrdClearTimer)
+		.Process(this->IsZeroSpeed)
 		;
 }
 

src/Ext/Techno/Body.h

@@ -106,6 +106,8 @@ class TechnoExt
 		CoordStruct LastTargetCrd;
 		CDTimerClass LastTargetCrdClearTimer;
 
+		bool IsZeroSpeed; // Temporary speed multipliers have made this techno stationary.
+
 		ExtData(TechnoClass* OwnerObject) : Extension<TechnoClass>(OwnerObject)
 			, TypeExtData { nullptr }
 			, Shield {}
@@ -177,6 +179,7 @@ class TechnoExt
 			, HoverShutdown { false }
 			, LastTargetCrd { CoordStruct::Empty }
 			, LastTargetCrdClearTimer {}
+			, IsZeroSpeed { false }
 		{ }
 
 		void OnEarlyUpdate();

src/Ext/Techno/Hooks.DisallowMoving.cpp

@@ -7,11 +7,6 @@
 
 #pragma region Helpers
 
-namespace ApproachTargetTemp
-{
-	int WeaponIndex;
-}
-
 static int inline HandleHunt(FootClass* pThis)
 {
 	if (TechnoExt::CannotMove(pThis, true))
@@ -24,23 +19,6 @@ static int inline HandleHunt(FootClass* pThis)
 	return 0;
 }
 
-static bool inline HandleApproachTarget(FootClass* pThis, int& weaponIndex)
-{
-	if (TechnoExt::CannotMove(pThis, true))
-	{
-		const auto pTarget = pThis->Target;
-		weaponIndex = pThis->SelectWeapon(pTarget);
-
-		if (!pThis->IsCloseEnough(pTarget, weaponIndex))
-		{
-			pThis->SetTarget(nullptr);
-			return true;
-		}
-	}
-
-	return false;
-}
-
 #pragma endregion
 
 #pragma region Infantry
@@ -52,30 +30,6 @@ static bool __fastcall InfantryClass_CantMove_Wrapper(InfantryClass* pThis)
 
 DEFINE_FUNCTION_JUMP(CALL6, 0x75ACBD, InfantryClass_CantMove_Wrapper);
 
-DEFINE_HOOK(0x75AED1, WalkLocomotionClass_MovementAI_DisallowMoving, 0x5)
-{
-	GET(WalkLocomotionClass*, pThis, EBP);
-
-	auto const pLinkedTo = pThis->LinkedTo;
-
-	if (TechnoExt::CannotMove(pLinkedTo, true))
-	{
-		if (pThis->Is_Moving())
-		{
-			pThis->Force_Immediate_Destination(CoordStruct::Empty);
-			pThis->Stop_Moving();
-		}
-
-		return 0x75C1F1;
-	}
-	else if (pLinkedTo->Destination && pThis->Destination == CoordStruct::Empty)
-	{
-		pLinkedTo->SetDestination(pLinkedTo->Destination, false);
-	}
-
-	return 0;
-}
-
 DEFINE_HOOK(0x51AA84, InfantryClass_AssignDestination_DisallowMoving, 0x6)
 {
 	GET(InfantryClass*, pThis, EBP);
@@ -150,18 +104,6 @@ DEFINE_HOOK(0x51CB8C, InfantryClass_GetFireError_DisallowMoving, 0x6)
 	return 0;
 }
 
-DEFINE_HOOK(0x522352, InfantryClass_ApproachTarget_DisallowMoving, 0x6)
-{
-	GET(InfantryClass*, pThis, ECX);
-
-	int weaponIndex = -1;
-
-	if (HandleApproachTarget(pThis, weaponIndex))
-		return 0x522373;
-
-	return 0;
-}
-
 #pragma endregion
 
 #pragma region Unit
@@ -222,12 +164,16 @@ DEFINE_HOOK(0x740744, UnitClass_WhatAction_DisallowMoving_2, 0x6)
 	return 0;
 }
 
-DEFINE_HOOK(0x736B60, UnitClass_Rotation_AI_DisallowMoving, 0x6)
+DEFINE_HOOK(0x736B60, UnitClass_RotationAI_DisallowMoving, 0x6)
 {
 	GET(UnitClass*, pThis, ESI);
 
 	const auto pTypeExt = TechnoTypeExt::ExtMap.Find(pThis->Type);
-	return (pTypeExt->TurretResponse.isset() ? !pTypeExt->TurretResponse.Get() : TechnoExt::CannotMove(pThis, false)) ? 0x736AFB : 0;
+
+	if (pTypeExt->TurretResponse.isset() ? !pTypeExt->TurretResponse.Get() : TechnoExt::CannotMove(pThis, false))
+		return 0x736AFB;
+
+	return 0;
 }
 
 DEFINE_HOOK(0x73EFC4, UnitClass_Mission_Hunt_DisallowMoving, 0x6)
@@ -254,35 +200,6 @@ DEFINE_HOOK(0x74132B, UnitClass_GetFireError_DisallowMoving, 0x7)
 	return 0;
 }
 
-DEFINE_HOOK(0x7414E0, UnitClass_ApproachTarget_DisallowMoving, 0xA)
-{
-	GET(UnitClass*, pThis, ECX);
-
-	int weaponIndex = -1;
-
-	if (HandleApproachTarget(pThis, weaponIndex))
-		return 0x741690;
-
-	ApproachTargetTemp::WeaponIndex = weaponIndex;
-	return 0;
-}
-
-DEFINE_HOOK(0x7415A9, UnitClass_ApproachTarget_SetWeaponIndex, 0x6)
-{
-	if (ApproachTargetTemp::WeaponIndex != -1)
-	{
-		GET(UnitClass*, pThis, ESI);
-
-		R->EDI(VTable::Get(pThis));
-		R->EAX(ApproachTargetTemp::WeaponIndex);
-		ApproachTargetTemp::WeaponIndex = -1;
-
-		return 0x7415BA;
-	}
-
-	return 0;
-}
-
 #pragma endregion
 
 #pragma region Foot
@@ -300,7 +217,18 @@ DEFINE_HOOK(0x4D4203, FootClass_Mission_Move_DisallowMoving, 0x6)
 	return 0;
 }
 
-DEFINE_HOOK(0x4D7DCC, FootClass_ActiveClickWith_DisallowMoving, 0x6)
+DEFINE_HOOK(0x4D9563, FootClass_AssignDestination_DisallowMoving, 0x6)
+{
+	GET(FootClass*, pThis, EBP);
+
+	// Prevent locomotor processing when assigned target if temporarily immobilized.
+	if (TechnoExt::ExtMap.Find(pThis)->IsZeroSpeed)
+		return 0x4D96C2;
+
+	return 0;
+}
+
+DEFINE_HOOK(0x4D7EB5, FootClass_ActiveClickWith_DisallowMoving, 0x5)
 {
 	GET(FootClass*, pThis, ESI);
 
@@ -334,6 +262,16 @@ DEFINE_HOOK(0x4D6AAB, FootClass_Mission_AreaGuard_DisallowMoving, 0x6)
 	return 0;
 }
 
+DEFINE_HOOK(0x4D5716, FootClass_ApproachTarget_DisallowMoving, 0x7)
+{
+	GET(FootClass*, pThis, EBX);
+
+	if (TechnoExt::CannotMove(pThis, true))
+		return 0x4D571D;
+
+	return 0;
+}
+
 #pragma endregion
 
 #pragma region Techno

src/Ext/Techno/Hooks.cpp

@@ -31,7 +31,7 @@ DEFINE_HOOK(0x7363C9, UnitClass_AI_AnimationPaused, 0x6)
 	enum { SkipGameCode = 0x7363DE };
 
 	GET(UnitClass*, pThis, ESI);
-	
+
 	if (TechnoExt::ExtMap.Find(pThis)->DelayedFireSequencePaused)
 		return SkipGameCode;
 
@@ -62,6 +62,27 @@ DEFINE_HOOK(0x4DA54E, FootClass_AI, 0x6)
 	pExt->UpdateTiberiumEater();
 	pExt->AmmoAutoConvertActions();
 
+	// Check speed multipliers for zero, update things like allowing
+	// locomotor to process destination again.
+	if (TechnoExt::GetCurrentSpeedMultiplier(pThis) > 0.0)
+	{
+		bool wasZeroSpeed = pExt->IsZeroSpeed;
+		pExt->IsZeroSpeed = false;
+
+		if (wasZeroSpeed)
+		{
+			if (auto const pDest = pThis->Destination)
+			{
+				pThis->Destination = nullptr; // Force it to update.
+				pThis->SetDestination(pDest, false);
+			}
+		}
+	}
+	else
+	{
+		pExt->IsZeroSpeed = true;
+	}
+
 	return 0;
 }
 
@@ -850,7 +871,7 @@ DEFINE_HOOK(0x655DDD, RadarClass_ProcessPoint_RadarInvisible, 0x6)
 	if (pTypeExt->OwnerObject()->RadarInvisible
 		&& EnumFunctions::CanTargetHouse(pTypeExt->RadarInvisibleToHouse.Get(AffectedHouse::Enemies), pTechno->Owner, HouseClass::CurrentPlayer))
 	{
-			return Invisible;
+		return Invisible;
 	}
 
 	return GoOtherChecks;
@@ -1351,7 +1372,7 @@ DEFINE_HOOK(0x71A8BD, TemporalClass_Update_WarpAwayAnim, 0x5)
 		AnimExt::CreateRandomAnim(pExt->WarpAway, pTarget->Location, nullptr, pTarget->Owner);
 		return 0x71A90E;
 	}
-	
+
 	return 0;
 }