refactor: Split logic

Stubbjax · Stubbjax · commit ccf07a011799 · 2025-09-24T17:43:27.000+10:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp b/Generals/Code/GameEngine/Source/GameClient/Drawable.cpp
@@ -3388,8 +3388,9 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 
 		Color color, outlineColor;
 		DisabledMaskType mask = obj->getDisabledFlags();
+		mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD));
 
-		if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) || (mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD)), DISABLEDMASK_ANY_SET(mask)))
+		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
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
@@ -3886,8 +3886,9 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)
 
 		Color color, outlineColor;
 		DisabledMaskType mask = obj->getDisabledFlags();
+		mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD));
 
-		if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) || (mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD)), DISABLEDMASK_ANY_SET(mask)))
+		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

Original file line number	Diff line number	Diff line change
`@@ -3388,8 +3388,9 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)`
`3388`	`3388`
`3389`	`3389`	`Color color, outlineColor;`
`3390`	`3390`	`DisabledMaskType mask = obj->getDisabledFlags();`
	`3391`	`+ mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD));`
`3391`	`3392`
`3392`		`- if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) \|\| (mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD)), DISABLEDMASK_ANY_SET(mask)))`
	`3393`	`+ if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) \|\| DISABLEDMASK_ANY_SET(mask))`
`3393`	`3394`	`{`
`3394`	`3395`	`color = GameMakeColor( 0, healthRatio * 255.0f, 255, 255 );//blue to cyan`
`3395`	`3396`	`outlineColor = GameMakeColor( 0, healthRatio * 128.0f, 128, 255 );//dark blue to dark cyan`
Original file line number	Diff line number	Diff line change
`@@ -3886,8 +3886,9 @@ void Drawable::drawHealthBar(const IRegion2D* healthBarRegion)`
`3886`	`3886`
`3887`	`3887`	`Color color, outlineColor;`
`3888`	`3888`	`DisabledMaskType mask = obj->getDisabledFlags();`
	`3889`	`+ mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD));`
`3889`	`3890`
`3890`		`- if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) \|\| (mask.clear(MAKE_DISABLED_MASK(DISABLED_HELD)), DISABLEDMASK_ANY_SET(mask)))`
	`3891`	`+ if (obj->getStatusBits().test(OBJECT_STATUS_UNDER_CONSTRUCTION) \|\| DISABLEDMASK_ANY_SET(mask))`
`3891`	`3892`	`{`
`3892`	`3893`	`color = GameMakeColor( 0, healthRatio * 255.0f, 255, 255 );//blue to cyan`
`3893`	`3894`	`outlineColor = GameMakeColor( 0, healthRatio * 128.0f, 128, 255 );//dark blue to dark cyan`