Skip to content

bugfix(aiupdate): Keep contained hackers hacking when Stop is pressed #3533

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

Merged
xezon merged 1 commit into from
Oct 19, 2026
+18 −2
Merged

bugfix(aiupdate): Keep contained hackers hacking when Stop is pressed #3533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,16 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
const StateID currentState = getStateMachine()->getCurrentStateID();

#if !RETAIL_COMPATIBLE_CRC
const Bool isUnpackingOrHacking = currentState == UNPACKING || currentState == HACK_INTERNET;

// TheSuperHackers @bugfix arcticdolphin 15/10/2026 prevent the player-issued Stop command from interrupting contained hackers, e.g. in the Internet Center.
if (parms->m_cmd == AICMD_IDLE && parms->m_cmdSource == CMD_FROM_PLAYER && isUnpackingOrHacking && getObject()->isContained())
{
return;
}

// TheSuperHackers @bugfix andrew-2e128 / Mauller 14/07/2025 prevent hacking hackers packing and unpacking when commanded to hack the internet
if (parms->m_cmd == AICMD_HACK_INTERNET && ( currentState == HACK_INTERNET || currentState == UNPACKING ) )
if (parms->m_cmd == AICMD_HACK_INTERNET && isUnpackingOrHacking)
{
return;
}
Expand Down
10 changes: 9 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,16 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
const StateID currentState = getStateMachine()->getCurrentStateID();

#if !RETAIL_COMPATIBLE_CRC
const Bool isUnpackingOrHacking = currentState == UNPACKING || currentState == HACK_INTERNET;

// TheSuperHackers @bugfix arcticdolphin 15/10/2026 prevent the player-issued Stop command from interrupting contained hackers, e.g. in the Internet Center.
if (parms->m_cmd == AICMD_IDLE && parms->m_cmdSource == CMD_FROM_PLAYER && isUnpackingOrHacking && getObject()->isContained())
{
return;
}

// TheSuperHackers @bugfix andrew-2e128 / Mauller 14/07/2025 prevent hacking hackers packing and unpacking when commanded to hack the internet
if (parms->m_cmd == AICMD_HACK_INTERNET && ( currentState == HACK_INTERNET || currentState == UNPACKING ) )
if (parms->m_cmd == AICMD_HACK_INTERNET && isUnpackingOrHacking)
{
return;
}
Expand Down
Loading