Skip to content

bugfix(ai): Fix checkForCrateToPickup never returning the created crate #3481

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
WebbontheWeb wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −0
Open

bugfix(ai): Fix checkForCrateToPickup never returning the created crate #3481

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
4 changes: 4 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 @@ -884,12 +884,16 @@ void AIUpdateInterface::chooseGoodLocomotorFromCurrentSet()
}

//----------------------------------------------------------------------------------------------------------
// TheSuperHackers @bugfix WebbontheWeb 07/10/2026 The function can now return the crate object.
Object* AIUpdateInterface::checkForCrateToPickup()
{
if (m_crateCreated != INVALID_ID)
{
#if RETAIL_COMPATIBLE_CRC
m_crateCreated = INVALID_ID; // we have processed it, so clear it.
Comment thread
Caball009 marked this conversation as resolved.
#endif
Object* crate = TheGameLogic->findObjectByID(m_crateCreated);
m_crateCreated = INVALID_ID; // we have processed it, so clear it.
if (crate)
{
for (BehaviorModule** m = crate->getBehaviorModules(); *m; ++m)
Expand Down
4 changes: 4 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 @@ -890,12 +890,16 @@ void AIUpdateInterface::chooseGoodLocomotorFromCurrentSet()
}

//----------------------------------------------------------------------------------------------------------
// TheSuperHackers @bugfix WebbontheWeb 07/10/2026 The function can now return the crate object.
Object* AIUpdateInterface::checkForCrateToPickup()
{
if (m_crateCreated != INVALID_ID)
{
#if RETAIL_COMPATIBLE_CRC
m_crateCreated = INVALID_ID; // we have processed it, so clear it.
#endif
Object* crate = TheGameLogic->findObjectByID(m_crateCreated);
m_crateCreated = INVALID_ID; // we have processed it, so clear it.
if (crate)
{
for (BehaviorModule** m = crate->getBehaviorModules(); *m; ++m)
Expand Down
Loading