refactor: Simplify enclosing container access

Author: Stubbjax

Generals/Code/GameEngine/Include/GameLogic/Object.h

@@ -421,6 +421,7 @@ class Object : public Thing, public Snapshot
 	void onRemovedFrom( Object *removedFrom );
 	Int getTransportSlotCount() const;
 	void friend_setContainedBy( Object *containedBy ) { m_containedBy = containedBy; }
+	ContainModuleInterface* getEnclosingContain(); // <<< Find the first enclosing container in the containment chain.
 
 	// Special Powers -------------------------------------------------------------------------------
 	SpecialPowerModuleInterface *getSpecialPowerModule( const SpecialPowerTemplate *specialPowerTemplate ) const;

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

@@ -207,23 +207,11 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 	}
 
 #if RETAIL_COMPATIBLE_CRC
-	Bool contained = self->getContainedBy() && self->getContainedBy()->getContainedBy();
+	if (self->getContainedBy() && self->getContainedBy()->getContainedBy())
 #else
 	// If our container or any parent containers are enclosing, we turn the heck off.
-	Bool contained = false;
-
-	for (Object* child = self, *container = self->getContainedBy(); container; child = container, container = container->getContainedBy())
-	{
-		ContainModuleInterface* containModule = container->getContain();
-		if (containModule && containModule->isEnclosingContainerFor(child))
-		{
-			contained = true;
-			break;
-		}
-	}
+	if (self->getEnclosingContain())
 #endif
-
-	if (contained)
 	{
 		removeAllInfluence();
 		return UPDATE_SLEEP_NONE;

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

@@ -667,6 +667,18 @@ Int Object::getTransportSlotCount() const
 	return count;
 }
 
+ContainModuleInterface* Object::getEnclosingContain()
+{
+	for (Object* child = this, *container = getContainedBy(); container; child = container, container = container->getContainedBy())
+	{
+		ContainModuleInterface* containModule = container->getContain();
+		if (containModule && containModule->isEnclosingContainerFor(child))
+			return containModule;
+	}
+
+	return NULL;
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Run from GameLogic::destroyObject */
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h

@@ -446,6 +446,7 @@ class Object : public Thing, public Snapshot
 	void onRemovedFrom( Object *removedFrom );
 	Int getTransportSlotCount() const;
 	void friend_setContainedBy( Object *containedBy ) { m_containedBy = containedBy; }
+	ContainModuleInterface* getEnclosingContain(); // <<< Find the first enclosing container in the containment chain.
 
 	// Special Powers -------------------------------------------------------------------------------
 	SpecialPowerModuleInterface *getSpecialPowerModule( const SpecialPowerTemplate *specialPowerTemplate ) const;

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

@@ -209,23 +209,11 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 	}
 
 #if RETAIL_COMPATIBLE_CRC
-	Bool contained = self->getContainedBy() && self->getContainedBy()->getContainedBy();
+	if (self->getContainedBy() && self->getContainedBy()->getContainedBy())
 #else
 	// If our container or any parent containers are enclosing, we turn the heck off.
-	Bool contained = false;
-
-	for (Object* child = self, *container = self->getContainedBy(); container; child = container, container = container->getContainedBy())
-	{
-		ContainModuleInterface* containModule = container->getContain();
-		if (containModule && containModule->isEnclosingContainerFor(child))
-		{
-			contained = true;
-			break;
-		}
-	}
+	if (self->getEnclosingContain())
 #endif
-
-	if (contained)
 	{
 		removeAllInfluence();
 		return UPDATE_SLEEP_NONE;

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

@@ -731,6 +731,18 @@ Int Object::getTransportSlotCount() const
 	return count;
 }
 
+ContainModuleInterface* Object::getEnclosingContain()
+{
+	for (Object* child = this, *container = getContainedBy(); container; child = container, container = container->getContainedBy())
+	{
+		ContainModuleInterface* containModule = container->getContain();
+		if (containModule && containModule->isEnclosingContainerFor(child))
+			return containModule;
+	}
+
+	return NULL;
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Run from GameLogic::destroyObject */
 //-------------------------------------------------------------------------------------------------