tweak: Always check enclosing container for the direct child

Stubbjax · Stubbjax · commit b5e3186662de · 2025-09-26T03:41:02.000+10:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
@@ -209,19 +209,16 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 #if RETAIL_COMPATIBLE_CRC
 	Bool contained = self->getContainedBy() && self->getContainedBy()->getContainedBy();
 #else
-	Object* container = self->getContainedBy();
 	Bool contained = false;
 
-	while (container)
+	for (Object* child = self, *container = self->getContainedBy(); container; child = container, container = container->getContainedBy())
 	{
 		ContainModuleInterface* containModule = container->getContain();
-		if (containModule && containModule->isEnclosingContainerFor(self))
+		if (containModule && containModule->isEnclosingContainerFor(child))
 		{
 			contained = true;
 			break;
 		}
-
-		container = container->getContainedBy();
 	}
 #endif
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PropagandaTowerBehavior.cpp
@@ -211,19 +211,16 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )
 #if RETAIL_COMPATIBLE_CRC
 	Bool contained = self->getContainedBy() && self->getContainedBy()->getContainedBy();
 #else
-	Object* container = self->getContainedBy();
 	Bool contained = false;
 
-	while (container)
+	for (Object* child = self, *container = self->getContainedBy(); container; child = container, container = container->getContainedBy())
 	{
 		ContainModuleInterface* containModule = container->getContain();
-		if (containModule && containModule->isEnclosingContainerFor(self))
+		if (containModule && containModule->isEnclosingContainerFor(child))
 		{
 			contained = true;
 			break;
 		}
-
-		container = container->getContainedBy();
 	}
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -209,19 +209,16 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )`
`209`	`209`	`#if RETAIL_COMPATIBLE_CRC`
`210`	`210`	`Bool contained = self->getContainedBy() && self->getContainedBy()->getContainedBy();`
`211`	`211`	`#else`
`212`		`- Object* container = self->getContainedBy();`
`213`	`212`	`Bool contained = false;`
`214`	`213`
`215`		`- while (container)`
	`214`	`+ for (Object* child = self, *container = self->getContainedBy(); container; child = container, container = container->getContainedBy())`
`216`	`215`	`{`
`217`	`216`	`ContainModuleInterface* containModule = container->getContain();`
`218`		`- if (containModule && containModule->isEnclosingContainerFor(self))`
	`217`	`+ if (containModule && containModule->isEnclosingContainerFor(child))`
`219`	`218`	`{`
`220`	`219`	`contained = true;`
`221`	`220`	`break;`
`222`	`221`	`}`
`223`		`-`
`224`		`- container = container->getContainedBy();`
`225`	`222`	`}`
`226`	`223`	`#endif`
`227`	`224`
Original file line number	Diff line number	Diff line change
`@@ -211,19 +211,16 @@ UpdateSleepTime PropagandaTowerBehavior::update( void )`
`211`	`211`	`#if RETAIL_COMPATIBLE_CRC`
`212`	`212`	`Bool contained = self->getContainedBy() && self->getContainedBy()->getContainedBy();`
`213`	`213`	`#else`
`214`		`- Object* container = self->getContainedBy();`
`215`	`214`	`Bool contained = false;`
`216`	`215`
`217`		`- while (container)`
	`216`	`+ for (Object* child = self, *container = self->getContainedBy(); container; child = container, container = container->getContainedBy())`
`218`	`217`	`{`
`219`	`218`	`ContainModuleInterface* containModule = container->getContain();`
`220`		`- if (containModule && containModule->isEnclosingContainerFor(self))`
	`219`	`+ if (containModule && containModule->isEnclosingContainerFor(child))`
`221`	`220`	`{`
`222`	`221`	`contained = true;`
`223`	`222`	`break;`
`224`	`223`	`}`
`225`		`-`
`226`		`- container = container->getContainedBy();`
`227`	`224`	`}`
`228`	`225`	`#endif`
`229`	`226`