Skip to content

bugfix(gui): Consistently show blue health bars for disabled objects #1622

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
merged 2 commits into from
Sep 25, 2025
Merged

bugfix(gui): Consistently show blue health bars for disabled objects #1622

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
3345aa6
bugfix: Show blue health bar for other disabled statuses while held
Stubbjax Sep 24, 2025
ccf07a0
refactor: Split logic
Stubbjax Sep 24, 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
5 changes: 4 additions & 1 deletion Generals/Code/GameEngine/Source/GameClient/Drawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3387,7 +3387,10 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
//

Color color, outlineColor;
if( obj->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) || (obj->isDisabled() && !obj->isDisabledByType(DISABLED_HELD)) )
DisabledMaskType mask = obj->getDisabledFlags();
mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD));

if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) || DISABLEDMASK_ANY_SET(mask))
{
color = GameMakeColor( 0, healthRatio * 255.0f, 255, 255 );//blue to cyan
outlineColor = GameMakeColor( 0, healthRatio * 128.0f, 128, 255 );//dark blue to dark cyan
Expand Down
5 changes: 4 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3885,7 +3885,10 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
//

Color color, outlineColor;
if( obj->getStatusBits().test( OBJECT_STATUS_UNDER_CONSTRUCTION ) || (obj->isDisabled() && !obj->isDisabledByType(DISABLED_HELD)) )
DisabledMaskType mask = obj->getDisabledFlags();
mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD));

if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) || DISABLEDMASK_ANY_SET(mask))
{
color = GameMakeColor( 0, healthRatio * 255.0f, 255, 255 );//blue to cyan
outlineColor = GameMakeColor( 0, healthRatio * 128.0f, 128, 255 );//dark blue to dark cyan
Expand Down
Loading