Skip to content

bugfix(gamelogic): Modules now cease updating when disabled by non-whitelisted disabled types #2458

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 2 commits into from
May 4, 2026
+32 −0
Merged

bugfix(gamelogic): Modules now cease updating when disabled by non-whitelisted disabled types #2458

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
cbc6ba7
bugfix: Modules now cease updating when disabled by non-whitelisted d…
Stubbjax Mar 15, 2026
a2c0626
refactor: Remove redundant checks
Stubbjax May 4, 2026
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
16 changes: 16 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3253,7 +3253,15 @@ void GameLogic::update()
{
UpdateModulePtr u = *it;
DisabledMaskType dis = u->friend_getObject()->getDisabledFlags();
#if RETAIL_COMPATIBLE_CRC
if (!dis.any() || dis.anyIntersectionWith(u->getDisabledTypesToProcess()))
#else
// TheSuperHackers @bugfix Stubbjax 15/03/2026 The disabled-types-to-process mask is now exclusive.
// Previously, if the disabled mask had any bits in common with the disabled-types-to-process mask,
// the update would be processed. Now, if any *other* bits are set in the disabled mask, the update
// is no longer processed.
if (u->getDisabledTypesToProcess().testForAll(dis))
#endif
{
USE_PERF_TIMER(GameLogic_update_normal)

Expand Down Expand Up @@ -3293,7 +3301,15 @@ void GameLogic::update()
UpdateSleepTime sleepLen = UPDATE_SLEEP_NONE; // default, if it is disabled.

DisabledMaskType dis = u->friend_getObject()->getDisabledFlags();
#if RETAIL_COMPATIBLE_CRC
if (!dis.any() || dis.anyIntersectionWith(u->getDisabledTypesToProcess()))
#else
// TheSuperHackers @bugfix Stubbjax 15/03/2026 The disabled-types-to-process mask is now exclusive.
// Previously, if the disabled mask had any bits in common with the disabled-types-to-process mask,
// the update would be processed. Now, if any *other* bits are set in the disabled mask, the update
// is no longer processed.
if (u->getDisabledTypesToProcess().testForAll(dis))
#endif
{
USE_PERF_TIMER(GameLogic_update_sleepy)

Expand Down
16 changes: 16 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3792,7 +3792,15 @@ void GameLogic::update()
{
UpdateModulePtr u = *it;
DisabledMaskType dis = u->friend_getObject()->getDisabledFlags();
#if RETAIL_COMPATIBLE_CRC
if (!dis.any() || dis.anyIntersectionWith(u->getDisabledTypesToProcess()))
#else
// TheSuperHackers @bugfix Stubbjax 15/03/2026 The disabled-types-to-process mask is now exclusive.
// Previously, if the disabled mask had any bits in common with the disabled-types-to-process mask,
// the update would be processed. Now, if any *other* bits are set in the disabled mask, the update
// is no longer processed.
if (u->getDisabledTypesToProcess().testForAll(dis))
#endif
{
USE_PERF_TIMER(GameLogic_update_normal)

Expand Down Expand Up @@ -3832,7 +3840,15 @@ void GameLogic::update()
UpdateSleepTime sleepLen = UPDATE_SLEEP_NONE; // default, if it is disabled.

DisabledMaskType dis = u->friend_getObject()->getDisabledFlags();
#if RETAIL_COMPATIBLE_CRC
if (!dis.any() || dis.anyIntersectionWith(u->getDisabledTypesToProcess()))
#else
// TheSuperHackers @bugfix Stubbjax 15/03/2026 The disabled-types-to-process mask is now exclusive.
// Previously, if the disabled mask had any bits in common with the disabled-types-to-process mask,
// the update would be processed. Now, if any *other* bits are set in the disabled mask, the update
// is no longer processed.
if (u->getDisabledTypesToProcess().testForAll(dis))
#endif
{
USE_PERF_TIMER(GameLogic_update_sleepy)

Expand Down
Loading