Skip to content

bugfix(weapon): fix patriot assist system extended range bug #1886

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+28 −0
Draft

bugfix(weapon): fix patriot assist system extended range bug #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3dcc1e
bugfix(weapon): fix patriot assist system extended range bug
bobtista Nov 19, 2025
f182b19
chore(compat): guard patriot assist fix behind CRC compatibility flag
bobtista Nov 19, 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
8 changes: 8 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3286,6 +3286,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,

if (!victim)
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
#endif
// Hard to kill em if they're already dead. jba
return;
}
Expand All @@ -3305,6 +3309,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
void AIUpdateInterface::privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
{
if (!victim) {
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
#endif
return;
}

Expand Down
6 changes: 6 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2746,6 +2746,12 @@ static void makeAssistanceRequest( Object *requestOf, void *userData )
if( requestOf == requestData->m_requestingObject )
return;

#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista Prevent patriot from assisting when it is the target
if( requestOf == requestData->m_victimObject )
return;
#endif

// Only request of our kind of people
if( !requestOf->getTemplate()->isEquivalentTo( requestData->m_requestingObject->getTemplate() ) )
return;
Expand Down
8 changes: 8 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3427,6 +3427,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,

if (!victim)
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
#endif
// Hard to kill em if they're already dead. jba
return;
}
Expand All @@ -3446,6 +3450,10 @@ void AIUpdateInterface::privateAttackObject( Object *victim, Int maxShotsToFire,
void AIUpdateInterface::privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource )
{
if (!victim) {
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista Reset weapons lock to fix patriot turret extended range bug
getObject()->releaseWeaponLock(LOCKED_TEMPORARILY);
#endif
return;
}

Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2957,6 +2957,12 @@ static void makeAssistanceRequest( Object *requestOf, void *userData )
if( requestOf == requestData->m_requestingObject )
return;

#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista Prevent patriot from assisting when it is the target
if( requestOf == requestData->m_victimObject )
return;
#endif

// Only request of our kind of people
if( !requestOf->getTemplate()->isEquivalentTo( requestData->m_requestingObject->getTemplate() ) )
return;
Expand Down
Loading