Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

CrimRecya · Jan 8, 2025 · 0856165 · 0856165
2 parents 184d0ff + 261d180
commit 0856165
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Ext/CaptureManager/Body.cpp b/src/Ext/CaptureManager/Body.cpp
@@ -96,7 +96,7 @@ bool CaptureManagerExt::CaptureUnit(CaptureManagerClass* pManager, TechnoClass*
 			if (threatDelay > 0)
 			{
 				if (const auto pExt = TechnoExt::ExtMap.Find(pTarget))
-					pExt->BeControlledThreatFrame = Unsorted::CurrentFrame + threatDelay;
+					pExt->BeControlledThreatFrame = Unsorted::CurrentFrame() + threatDelay;
 			}
 
 			if (pTarget->SetOwningHouse(pManager->Owner->Owner, !silent))
@@ -141,7 +141,7 @@ bool CaptureManagerExt::CaptureUnit(CaptureManagerClass* pManager, AbstractClass
 		if (auto pTechnoTypeExt = TechnoTypeExt::ExtMap.Find(pManager->Owner->GetTechnoType()))
 			bRemoveFirst = pTechnoTypeExt->MultiMindControl_ReleaseVictim;
 
-		return CaptureManagerExt::CaptureUnit(pManager, pTarget, bRemoveFirst, pControlledAnimType, threatDelay);
+		return CaptureManagerExt::CaptureUnit(pManager, pTarget, bRemoveFirst, pControlledAnimType, false, threatDelay);
 	}
 
 	return false;

diff --git a/src/Ext/Techno/Hooks.Misc.cpp b/src/Ext/Techno/Hooks.Misc.cpp
@@ -449,7 +449,7 @@ bool __fastcall CanAttackMindControlled(TechnoClass* pControlled, TechnoClass* p
 	if (!pExt)
 		return true;
 
-	return pExt->BeControlledThreatFrame < Unsorted::CurrentFrame();
+	return pExt->BeControlledThreatFrame <= Unsorted::CurrentFrame();
 }
 
 DEFINE_HOOK(0x7089E8, TechnoClass_AllowedToRetaliate_AttackMindControlledDelay, 0x6)