Skip to content

refactor(bitflags): Simplify conditions with testForAny, testForAll and remove unexpected assert in BitFlags::testForAll #2476

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
Mar 21, 2026
Merged

refactor(bitflags): Simplify conditions with testForAny, testForAll and remove unexpected assert in BitFlags::testForAll #2476

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
795dcd8
refactor(bitflags): Simplify conditions with testForAny, testForAll a…
xezon Mar 19, 2026
b971452
Replicate in Generals
xezon Mar 21, 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
2 changes: 0 additions & 2 deletions Generals/Code/GameEngine/Include/Common/BitFlags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ class BitFlags
//All argument bits must be set in our bits too in order to return TRUE
Bool testForAll( const BitFlags& that ) const
{
DEBUG_ASSERTCRASH( that.any(), ("BitFlags::testForAll is always true if you ask about zero flags. Did you mean that?") );

BitFlags tmp = *this;
tmp.m_bits.flip();
tmp.m_bits &= that.m_bits;
Expand Down
5 changes: 2 additions & 3 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,11 @@ Bool DieMuxData::isDieApplicable(const Object* obj, const DamageInfo *damageInfo
return false;

// all 'exempt' bits must be clear for us to run.
if( m_exemptStatus.any() && obj->getStatusBits().testForAny( m_exemptStatus ) )
if( !obj->getStatusBits().testForNone( m_exemptStatus ) )
return false;

// all 'required' bits must be set for us to run.
// But only if we have a required status to check
if( m_requiredStatus.any() && !obj->getStatusBits().testForAll( m_requiredStatus ) )
if( !obj->getStatusBits().testForAll( m_requiredStatus ) )
return false;

return true;
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ Bool UpgradeMux::testUpgradeConditions( const UpgradeMaskType& keyMask ) const
getUpgradeActivationMasks(activation, conflicting);

//Okay, make sure we don't have any conflicting upgrades
if( !keyMask.any() || !keyMask.testForAny( conflicting ) )
if( keyMask.testForNone( conflicting ) )
{
//Make sure we have activation conditions
if( activation.any() )
Expand Down
2 changes: 0 additions & 2 deletions GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ class BitFlags
//All argument bits must be set in our bits too in order to return TRUE
Bool testForAll( const BitFlags& that ) const
{
DEBUG_ASSERTCRASH( that.any(), ("BitFlags::testForAll is always true if you ask about zero flags. Did you mean that?") );

BitFlags tmp = *this;
tmp.m_bits.flip();
tmp.m_bits &= that.m_bits;
Expand Down
5 changes: 2 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/DieModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,11 @@ Bool DieMuxData::isDieApplicable(const Object* obj, const DamageInfo *damageInfo
return false;

// all 'exempt' bits must be clear for us to run.
if( m_exemptStatus.any() && obj->getStatusBits().testForAny( m_exemptStatus ) )
if( !obj->getStatusBits().testForNone( m_exemptStatus ) )
return false;

// all 'required' bits must be set for us to run.
// But only if we have a required status to check
if( m_requiredStatus.any() && !obj->getStatusBits().testForAll( m_requiredStatus ) )
if( !obj->getStatusBits().testForAll( m_requiredStatus ) )
return false;

return true;
Expand Down
3 changes: 1 addition & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,7 @@ Bool StealthUpdate::allowedToStealth( Object *stealthOwner ) const
}

//We need all required status or else we fail
// If we have any requirements
if( data->m_requiredStatus.any() && !self->getStatusBits().testForAll( data->m_requiredStatus ) )
if( !self->getStatusBits().testForAll( data->m_requiredStatus ) )
return FALSE;

//If we have any forbidden statii, then fail
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/UpgradeModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ Bool UpgradeMux::testUpgradeConditions( const UpgradeMaskType& keyMask ) const
getUpgradeActivationMasks(activation, conflicting);

//Okay, make sure we don't have any conflicting upgrades
if( !keyMask.any() || !keyMask.testForAny( conflicting ) )
if( keyMask.testForNone( conflicting ) )
{
//Make sure we have activation conditions
if( activation.any() )
Expand Down
Loading