refactor: Apply new enclosing container visibility logic

Author: Stubbjax

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

@@ -2833,7 +2833,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 	Bool doAnimation = provideFeedback
 		&& newLevel > oldLevel
 		&& !isKindOf(KINDOF_IGNORED_IN_GUI)
-		&& getDrawable()->isVisible();
+		&& isSelfOrEnclosingContainedByVisible();
 
 	if( doAnimation && TheGameLogic->getDrawIconUI() )
 	{

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

@@ -886,7 +886,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 
 		// TheSuperHackers @todo: Remove hardcoded KINDOF_MINE check and apply PlayFXWhenStealthed = Yes to the mine weapons instead.
 
-		if(!sourceObj->getDrawable()->isVisible()							// if user watching cannot see us
+		if(!sourceObj->isSelfOrEnclosingContainedByVisible()	// if user watching cannot see us
 			&& !sourceObj->isKindOf(KINDOF_MINE)								// and not a mine (which always do the FX, even if hidden)...
 			&& !isPlayFXWhenStealthed()													// and not a weapon marked to playwhenstealthed
 			)

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

@@ -3148,7 +3148,7 @@ void Object::onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel ne
 	Bool doAnimation = provideFeedback
 		&& newLevel > oldLevel
 		&& !isKindOf(KINDOF_IGNORED_IN_GUI)
-		&& getDrawable()->isVisible();
+		&& isSelfOrEnclosingContainedByVisible();
 
 	if( doAnimation && TheGameLogic->getDrawIconUI() )
 	{

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/HackInternetAIUpdate.cpp

@@ -543,7 +543,7 @@ StateReturnType HackInternetState::update()
 				//Grant the unit some experience for a successful hack.
 				xp->addExperiencePoints( ai->getXpPerCashUpdate() );
 
-				if (owner->getDrawable()->isVisible())
+				if (owner->isSelfOrEnclosingContainedByVisible())
 				{
 					// OY LOOK!  I AM USING LOCAL PLAYER.  Do not put anything other than TheInGameUI->addFloatingText in the block this controls!!!
 					//Display cash income floating over the hacker.

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

@@ -63,7 +63,6 @@
 #include "GameLogic/Module/AutoDepositUpdate.h"
 #include "GameLogic/Module/AIUpdate.h"
 #include "GameLogic/Object.h"
-#include "GameClient/Drawable.h"
 #include "GameClient/InGameUI.h"
 #include "GameClient/Color.h"
 #include "GameClient/GameText.h"
@@ -173,7 +172,7 @@ UpdateSleepTime AutoDepositUpdate::update( void )
 			getObject()->getControllingPlayer()->getScoreKeeper()->addMoneyEarned( modData->m_depositAmount);
 		}
 
-		if (moneyAmount > 0 && getObject()->getDrawable()->isVisible())
+		if (moneyAmount > 0 && getObject()->isSelfOrEnclosingContainedByVisible())
 		{
 
       const Object *owner = getObject();

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/DockUpdate/SupplyCenterDockUpdate.cpp

@@ -34,7 +34,6 @@
 #include "GameLogic/Module/SupplyCenterDockUpdate.h"
 #include "GameLogic/Module/SupplyTruckAIUpdate.h"
 #include "GameClient/Color.h"
-#include "GameClient/Drawable.h"
 #include "GameClient/InGameUI.h"
 #include "GameClient/GameText.h"
 
@@ -129,7 +128,7 @@ Bool SupplyCenterDockUpdate::action( Object* docker, Object *drone )
 		}
 	}
 
-	if (value > 0 && getObject()->getDrawable()->isVisible())
+	if (value > 0 && getObject()->isSelfOrEnclosingContainedByVisible())
 	{
 		// OY LOOK!  I AM USING LOCAL PLAYER.  Do not put anything other than TheInGameUI->addFloatingText in the block this controls!!!
 		// Setup info for adding a floating text

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

@@ -917,7 +917,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
 
 		// TheSuperHackers @todo: Remove hardcoded KINDOF_MINE check and apply PlayFXWhenStealthed = Yes to the mine weapons instead.
 
-		if(!sourceObj->getDrawable()->isVisible()							// if user watching cannot see us
+		if(!sourceObj->isSelfOrEnclosingContainedByVisible()	// if user watching cannot see us
 			&& !sourceObj->isKindOf(KINDOF_MINE)								// and not a mine (which always do the FX, even if hidden)...
 			&& !isPlayFXWhenStealthed()													// and not a weapon marked to playwhenstealthed
 			)