tweak: Adjust logic to cover all container hierarchies

Author: Stubbjax

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

@@ -210,11 +210,19 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 	Bool contained = self->getContainedBy() && self->getContainedBy()->getContainedBy();
 #else
 	Object* container = self->getContainedBy();
+	Bool contained = false;
 
-	while (container && container->getContainedBy())
-		container = container->getContainedBy();
+	while (container)
+	{
+		ContainModuleInterface* containModule = container->getContain();
+		if (containModule && containModule->isEnclosingContainerFor(self))
+		{
+			contained = true;
+			break;
+		}
 
-	Bool contained = (container && container->getContain()->isEnclosingContainerFor(self));
+		container = container->getContainedBy();
+	}
 #endif
 
 	if (contained)

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

@@ -212,11 +212,19 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 	Bool contained = self->getContainedBy() && self->getContainedBy()->getContainedBy();
 #else
 	Object* container = self->getContainedBy();
+	Bool contained = false;
 
-	while (container && container->getContainedBy())
-		container = container->getContainedBy();
+	while (container)
+	{
+		ContainModuleInterface* containModule = container->getContain();
+		if (containModule && containModule->isEnclosingContainerFor(self))
+		{
+			contained = true;
+			break;
+		}
 
-	Bool contained = (container && container->getContain()->isEnclosingContainerFor(self));
+		container = container->getContainedBy();
+	}
 #endif
 
 	if (contained)