[GEN][ZH] Fix assert about using uninitialized garrison points when entering a structure for the first time (#783)

Author: roossienb

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

@@ -638,11 +638,10 @@ void GarrisonContain::trackTargets( void )
 	AIUpdateInterface *ai;
 	Object *obj;
 
+	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
+
 	for( ContainedItemsList::const_iterator it = containList.begin(); it != containList.end(); ++it )
 	{
-
-		DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
-
 		// get the object
 		obj = *it;
 

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

@@ -319,15 +319,25 @@ void OpenContain::addToContain( Object *rider )
 		addOrRemoveObjFromWorld(rider, false);
 	}
 
-	// ensure our contents are positions correctly.
+#if RETAIL_COMPATIBLE_CRC
+	// ensure our occupants are positioned correctly.
+	// TheSuperHackers @info Moving this call elsewhere will cause retail mismatch.
 	redeployOccupants();
+#endif
 
 	// trigger an onContaining event for the object that just "ate" something
 	if( getObject()->getContain() )
 	{
 		getObject()->getContain()->onContaining( rider );
 	}
 
+	// ensure our occupants are positioned correctly.
+	// TheSuperHackers @fix Skyaero 10/07/2025 Now (re)deploys the occupants after the garrison points
+	// had a chance to initialize with prior call to onContaining(). No user facing bug was observed.
+#if !RETAIL_COMPATIBLE_CRC
+	redeployOccupants();
+#endif
+
 	// trigger an onContainedBy event for the object that just got "eaten" by us
 	rider->onContainedBy( getObject() );
 

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

@@ -692,11 +692,10 @@ void GarrisonContain::trackTargets( void )
 	AIUpdateInterface *ai;
 	Object *obj;
 
+	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
+
 	for( ContainedItemsList::const_iterator it = containList.begin(); it != containList.end(); ++it )
 	{
-
-		DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
-
 		// get the object
 		obj = *it;
 

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

@@ -341,15 +341,25 @@ void OpenContain::addToContain( Object *rider )
 		addOrRemoveObjFromWorld(rider, false);
 	}
 
-	// ensure our contents are positions correctly.
+#if RETAIL_COMPATIBLE_CRC
+	// ensure our occupants are positioned correctly.
+	// TheSuperHackers @info Moving this call elsewhere will cause retail mismatch.
 	redeployOccupants();
+#endif
 
 	// trigger an onContaining event for the object that just "ate" something
 	if( getObject()->getContain() )
 	{
 		getObject()->getContain()->onContaining( rider, wasSelected );
 	}
 
+	// ensure our occupants are positioned correctly.
+	// TheSuperHackers @fix Skyaero 10/07/2025 Now (re)deploys the occupants after the garrison points
+	// had a chance to initialize with prior call to onContaining(). No user facing bug was observed.
+#if !RETAIL_COMPATIBLE_CRC
+	redeployOccupants();
+#endif
+
 	// trigger an onContainedBy event for the object that just got "eaten" by us
 	rider->onContainedBy( getObject() );