Skip to content

Commit f1138f1

Browse files
authored
bugfix(object): Show veterancy effects of stealthed objects for allies and observers (#1867)
1 parent 44dbf0a commit f1138f1

File tree

2 files changed

+2
-7
lines changed
  • GeneralsMD/Code/GameEngine/Source/GameLogic/Object
  • Generals/Code/GameEngine/Source/GameLogic/Object

2 files changed

+2
-7
lines changed

Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2824,9 +2824,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
28242824
Bool doAnimation = provideFeedback
28252825
&& newLevel > oldLevel
28262826
&& !isKindOf(KINDOF_IGNORED_IN_GUI)
2827-
&& (isLocallyControlled()
2828-
|| !testStatus(OBJECT_STATUS_STEALTHED)
2829-
|| testStatus(OBJECT_STATUS_DETECTED));
2827+
&& getDrawable()->isVisible();
28302828

28312829
if( doAnimation && TheGameLogic->getDrawIconUI() )
28322830
{

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3139,10 +3139,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
31393139
Bool doAnimation = provideFeedback
31403140
&& newLevel > oldLevel
31413141
&& !isKindOf(KINDOF_IGNORED_IN_GUI)
3142-
&& (isLocallyControlled()
3143-
|| !testStatus(OBJECT_STATUS_STEALTHED)
3144-
|| testStatus(OBJECT_STATUS_DETECTED)
3145-
|| testStatus(OBJECT_STATUS_DISGUISED));
3142+
&& getDrawable()->isVisible();
31463143

31473144
if( doAnimation && TheGameLogic->getDrawIconUI() )
31483145
{

0 commit comments

Comments
 (0)