[GEN][ZH] Fix incorrect garrison points debug assert hit in Shell Map (#1293)

roossienb · web-flow · commit 4e1aa51be49d · 2025-07-16T18:00:37.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
@@ -638,7 +638,7 @@ void GarrisonContain::trackTargets( void )
 	AIUpdateInterface *ai;
 	Object *obj;
 
-	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
+	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized || containList.empty(), ("garrisonPoints are not inited"));
 
 	for( ContainedItemsList::const_iterator it = containList.begin(); it != containList.end(); ++it )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
@@ -692,7 +692,7 @@ void GarrisonContain::trackTargets( void )
 	AIUpdateInterface *ai;
 	Object *obj;
 
-	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));
+	DEBUG_ASSERTCRASH(m_garrisonPointsInitialized || containList.empty(), ("garrisonPoints are not inited"));
 
 	for( ContainedItemsList::const_iterator it = containList.begin(); it != containList.end(); ++it )
 	{

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ void GarrisonContain::trackTargets( void )`
`638`	`638`	`AIUpdateInterface *ai;`
`639`	`639`	`Object *obj;`
`640`	`640`
`641`		`- DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));`
	`641`	`+ DEBUG_ASSERTCRASH(m_garrisonPointsInitialized \|\| containList.empty(), ("garrisonPoints are not inited"));`
`642`	`642`
`643`	`643`	`for( ContainedItemsList::const_iterator it = containList.begin(); it != containList.end(); ++it )`
`644`	`644`	`{`
Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ void GarrisonContain::trackTargets( void )`
`692`	`692`	`AIUpdateInterface *ai;`
`693`	`693`	`Object *obj;`
`694`	`694`
`695`		`- DEBUG_ASSERTCRASH(m_garrisonPointsInitialized, ("garrisonPoints are not inited"));`
	`695`	`+ DEBUG_ASSERTCRASH(m_garrisonPointsInitialized \|\| containList.empty(), ("garrisonPoints are not inited"));`
`696`	`696`
`697`	`697`	`for( ContainedItemsList::const_iterator it = containList.begin(); it != containList.end(); ++it )`
`698`	`698`	`{`