Skip to content

[GEN][ZH] Fix hacking hackers packing and unpacking when told to hack the internet as part of a group #399

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

Closed
wants to merge 1 commit into from
Closed

[GEN][ZH] Fix hacking hackers packing and unpacking when told to hack the internet as part of a group #399

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: 10 additions & 0 deletions 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 @@ -126,6 +126,16 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
if (!isAllowedToRespondToAiCommands(parms))
return;

// TheSuperHackers @bugfix andrew-2e128 07/03/2025 Hackers pack and unpack unnecessary when selected in a group fixed. - issue #223
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs wrapping in a #if !RETAIL_COMPATIBLE_CRC block

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The wording here also needs fixing up along the lines of

"prevent hacking hackers packing and unpacking when told to hack the internet as part of a group selection"

if (parms->m_cmd == AICMD_HACK_INTERNET)
{
if ( getStateMachine()->getCurrentStateID() == HACK_INTERNET || getStateMachine()->getCurrentStateID() == UNPACKING )
{
return;
}
}
// end @bugfix

//If our hacker is currently packing up his gear, we need to prevent him
//from moving until completed. In order to accomplish this, we'll detect,
//then
Expand Down
10 changes: 10 additions & 0 deletions 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 @@ -126,6 +126,16 @@ void HackInternetAIUpdate::aiDoCommand(const AICommandParms* parms)
if (!isAllowedToRespondToAiCommands(parms))
return;

// TheSuperHackers @bugfix andrew-2e128 07/03/2025 Hackers pack and unpack unnecessary when selected in a group fixed. - issue #223
if (parms->m_cmd == AICMD_HACK_INTERNET)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These could also be condensed into a single if statement

{
if ( getStateMachine()->getCurrentStateID() == HACK_INTERNET || getStateMachine()->getCurrentStateID() == UNPACKING )
{
return;
}
}
// end @bugfix

//If our hacker is currently packing up his gear, we need to prevent him
//from moving until completed. In order to accomplish this, we'll detect,
//then
Expand Down