refactor: adjust enclosing container function return type and name

Author: Stubbjax

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

@@ -421,7 +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.
+	Object* getEnclosingContainedBy(); // <<< Find the first enclosing container in the containment chain.
 
 	// Special Powers -------------------------------------------------------------------------------
 	SpecialPowerModuleInterface *getSpecialPowerModule( const SpecialPowerTemplate *specialPowerTemplate ) const;

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

@@ -667,13 +667,13 @@ Int Object::getTransportSlotCount() const
 	return count;
 }
 
-ContainModuleInterface* Object::getEnclosingContain()
+Object* Object::getEnclosingContainedBy()
 {
 	for (Object* child = this, *container = getContainedBy(); container; child = container, container = container->getContainedBy())
 	{
 		ContainModuleInterface* containModule = container->getContain();
 		if (containModule && containModule->isEnclosingContainerFor(child))
-			return containModule;
+			return container;
 	}
 
 	return NULL;

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

@@ -446,7 +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.
+	Object* getEnclosingContainedBy(); // <<< Find the first enclosing container in the containment chain.
 
 	// Special Powers -------------------------------------------------------------------------------
 	SpecialPowerModuleInterface *getSpecialPowerModule( const SpecialPowerTemplate *specialPowerTemplate ) const;

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

@@ -731,13 +731,13 @@ Int Object::getTransportSlotCount() const
 	return count;
 }
 
-ContainModuleInterface* Object::getEnclosingContain()
+Object* Object::getEnclosingContainedBy()
 {
 	for (Object* child = this, *container = getContainedBy(); container; child = container, container = container->getContainedBy())
 	{
 		ContainModuleInterface* containModule = container->getContain();
 		if (containModule && containModule->isEnclosingContainerFor(child))
-			return containModule;
+			return container;
 	}
 
 	return NULL;