[GEN][ZH]Fixed garrison points not initialized before first use (#)

Author: Bart Roossien

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

@@ -324,15 +324,15 @@ void OpenContain::addToContain( Object *rider )
 		addOrRemoveObjFromWorld(rider, false);
 	}
 
-	// ensure our contents are positions correctly.
-	redeployOccupants();
-
 	// trigger an onContaining event for the object that just "ate" something
 	if( getObject()->getContain() )
 	{
 		getObject()->getContain()->onContaining( rider );
 	}
 
+	// ensure our contents are positions correctly.
+	redeployOccupants();
+
 	// trigger an onContainedBy event for the object that just got "eaten" by us
 	rider->onContainedBy( getObject() );
 

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

@@ -346,15 +346,16 @@ void OpenContain::addToContain( Object *rider )
 		addOrRemoveObjFromWorld(rider, false);
 	}
 
-	// ensure our contents are positions correctly.
-	redeployOccupants();
 
 	// trigger an onContaining event for the object that just "ate" something
 	if( getObject()->getContain() )
 	{
 		getObject()->getContain()->onContaining( rider, wasSelected );
 	}
 
+	// ensure our contents are positions correctly.
+	redeployOccupants();
+
 	// trigger an onContainedBy event for the object that just got "eaten" by us
 	rider->onContainedBy( getObject() );