Skip to content

[Minor] Auto Target Fix - Prioritize checking if the target is dead #1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+36 −0
Open

[Minor] Auto Target Fix - Prioritize checking if the target is dead #1908

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be6cf73
Update Hooks.BugFixes.cpp
Fly-Star-him Oct 11, 2025
754e444
update doc
Fly-Star-him Oct 12, 2025
1e07506
Merge branch 'develop' into canautotargetfix
Fly-Star-him Oct 12, 2025
881c512
Merge branch 'Phobos-developers:develop' into canautotargetfix
Fly-Star-him Oct 12, 2025
a68268b
Update Hooks.BugFixes.cpp
Fly-Star-him Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/Misc/Hooks.BugFixes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <AircraftClass.h>
#include <AircraftClass.h>
#include <AircraftTrackerClass.h>
#include <AnimClass.h>
#include <BuildingClass.h>
Expand Down Expand Up @@ -2698,4 +2698,19 @@ DEFINE_HOOK(0x5218C2, InfantryClass_UnmarkAllOccupationBits_ResetOwnerIdx, 0x6)
return (newFlag & 0x1C) == 0 || pExt->InfantryCount == 0 ? Reset : NoReset;
}

#pragma endregion
#pragma endregion

#pragma region CanAutoTargetFix

DEFINE_JUMP(LJMP, 0x6F7D88, 0x6F7DA9) // They should be placed at the front.

DEFINE_HOOK(0x6F7CB7, TechnoClass_CanAutoTargetObject_IsAlive, 0x7)
{
enum { ReturnFalse = 0x6F894F };

GET(TechnoClass*, pTarget, ESI);

return (!pTarget || !pTarget->IsAlive || pTarget->Health <= 0 || pTarget->InLimbo) ? ReturnFalse : 0;
}

#pragma endregion
Loading