bugfix(contain): fix exit path logic to utilize primary exit interface rally point if available

Signed-off-by: tintinhamans <5984296+tintinhamans@users.noreply.github.com>

Author: tintinhamans

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

@@ -925,9 +925,16 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 		std::vector<Coord3D> exitPath;
 		exitPath.push_back(endPosition);
 		exitPath.push_back(endPosition); // Do it twice, in case units stack up due to brief flying.  jba.
+#if !RETAIL_COMPATIBLE_CRC
+		// TheSuperHackers @bugfix arcticdolphin 02/03/2026 Use primary exit interface rally point if available.
+		if (const Coord3D *rallyPoint = getRallyPoint()) {
+			exitPath.push_back(*rallyPoint);
+		}
+#else
 		if (m_rallyPointExists) {
 			exitPath.push_back(m_rallyPoint);
 		}
+#endif
 
 		if( ai )
 		{
@@ -1422,6 +1429,18 @@ const Coord3D *OpenContain::getRallyPoint() const
 	if (m_rallyPointExists)
 		return &m_rallyPoint;
 
+#if !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix arcticdolphin 02/03/2026 Use primary exit interface rally point if available.
+	if (getObject())
+	{
+		ExitInterface *primaryExit = getObject()->getObjectExitInterface();
+		if (primaryExit && primaryExit != static_cast<ExitInterface *>(const_cast<OpenContain *>(this)))
+		{
+			return primaryExit->getRallyPoint();
+		}
+	}
+#endif
+
 	return nullptr;
 }
 

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

@@ -1045,9 +1045,16 @@ void OpenContain::exitObjectViaDoor( Object *exitObj, ExitDoorType exitDoor )
 		std::vector<Coord3D> exitPath;
 		exitPath.push_back(endPosition);
 		exitPath.push_back(endPosition); // Do it twice, in case units stack up due to brief flying.  jba.
+#if !RETAIL_COMPATIBLE_CRC
+		// TheSuperHackers @bugfix arcticdolphin 02/03/2026 Use primary exit interface rally point if available.
+		if (const Coord3D *rallyPoint = getRallyPoint()) {
+			exitPath.push_back(*rallyPoint);
+		}
+#else
 		if (m_rallyPointExists) {
 			exitPath.push_back(m_rallyPoint);
 		}
+#endif
 
 		if( ai )
 		{
@@ -1609,6 +1616,18 @@ const Coord3D *OpenContain::getRallyPoint() const
 	if (m_rallyPointExists)
 		return &m_rallyPoint;
 
+#if !RETAIL_COMPATIBLE_CRC
+	// TheSuperHackers @bugfix arcticdolphin 02/03/2026 Use primary exit interface rally point if available.
+	if (getObject())
+	{
+		ExitInterface *primaryExit = getObject()->getObjectExitInterface();
+		if (primaryExit && primaryExit != static_cast<ExitInterface *>(const_cast<OpenContain *>(this)))
+		{
+			return primaryExit->getRallyPoint();
+		}
+	}
+#endif
+
 	return nullptr;
 }