Skip to content

bugfix(logic): fix unexpected return in MSG_CANCEL_UNIT_CREATE handler #1881

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 2 commits into
base: main
Choose a base branch
from
Open

bugfix(logic): fix unexpected return in MSG_CANCEL_UNIT_CREATE handler #1881

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
1338b56
bugfix(logic): fix unexpected return in MSG_CANCEL_UNIT_CREATE
bobtista Nov 18, 2025
7dce50a
move behind retail compat 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
4 changes: 4 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
// get the unit production interface
ProductionUpdateInterface *pu = producer->getProductionUpdateInterface();
if( pu == NULL )
#if RETAIL_COMPATIBLE_CRC
Copy link

@xezon xezon Nov 19, 2025

Choose a reason for hiding this comment

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

It could be necessary. Please test if it is.

return;
#else
break;
#endif

// cancel the production
pu->cancelUnitCreate( productionID );
Expand Down
4 changes: 4 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,11 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
// get the unit production interface
ProductionUpdateInterface *pu = producer->getProductionUpdateInterface();
if( pu == NULL )
#if RETAIL_COMPATIBLE_CRC
return;
#else
break;
#endif

// cancel the production
pu->cancelUnitCreate( productionID );
Expand Down
Loading