Reduce dependence on MAX_FACTORY.

Fixes some assertions on some maps.
Warzone2100 · Dec 3, 2011 · 9474ae3 · 9474ae3
1 parent 8ee9e67
commit 9474ae3
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 108 deletions.
diff --git a/src/display3d.cpp b/src/display3d.cpp
@@ -2483,7 +2483,7 @@ void	renderDeliveryPoint(FLAG_POSITION *psPosition, bool blueprint)
 	pie_TRANSLATE(dv.x,dv.y,dv.z);
 
 	//quick check for invalid data
-	ASSERT( psPosition->factoryType < NUM_FLAG_TYPES && psPosition->factoryInc < MAX_FACTORY, "Invalid assembly point" );
+	ASSERT_OR_RETURN(, psPosition->factoryType < NUM_FLAG_TYPES && psPosition->factoryInc < MAX_FACTORY_FLAG_IMDS, "Invalid assembly point");
 
 	if(!psPosition->selected && !blueprint)
 	{

diff --git a/src/droid.cpp b/src/droid.cpp
@@ -4281,6 +4281,11 @@ void deleteTemplateFromProduction(DROID_TEMPLATE *psTemplate, unsigned player, Q
 			{
 				FACTORY             *psFactory = &psStruct->pFunctionality->factory;
 
+				if (psFactory->psAssemblyPoint->factoryInc >= asProductionRun[psFactory->psAssemblyPoint->factoryType].size())
+				{
+					continue;  // No production run to check.
+				}
+
 				ProductionRun &productionRun = asProductionRun[psFactory->psAssemblyPoint->factoryType][psFactory->psAssemblyPoint->factoryInc];
 				for (unsigned inc = 0; inc < productionRun.size(); ++inc)
 				{

diff --git a/src/game.cpp b/src/game.cpp
@@ -4717,6 +4717,10 @@ static bool loadSaveStructure2(const char *pFileName, STRUCTURE **ppList)
 					currentProd.psTemplate = psTempl;
 					ASSERT(psTempl, "No template found for template ID %d for %s (%d)", tid, objInfo(psStructure), id);
 				}
+				if (psFactory->psAssemblyPoint->factoryInc >= asProductionRun[psFactory->psAssemblyPoint->factoryType].size())
+				{
+					asProductionRun[psFactory->psAssemblyPoint->factoryType].resize(psFactory->psAssemblyPoint->factoryInc + 1);
+				}
 				asProductionRun[psFactory->psAssemblyPoint->factoryType][psFactory->psAssemblyPoint->factoryInc].push_back(currentProd);
 			}
 			break;
@@ -4923,7 +4927,9 @@ bool writeStructFile(const char *pFileName)
 						ini.setValue("Factory/commander/player", psFactory->psCommander->player);
 					}
 					ini.setValue("Factory/secondaryOrder", psFactory->secondaryOrder);
-					ProductionRun &productionRun = asProductionRun[psFactory->psAssemblyPoint->factoryType][psFactory->psAssemblyPoint->factoryInc];
+					ProductionRun emptyRun;
+					bool haveRun = psFactory->psAssemblyPoint->factoryInc < asProductionRun[psFactory->psAssemblyPoint->factoryType].size();
+					ProductionRun const &productionRun = haveRun? asProductionRun[psFactory->psAssemblyPoint->factoryType][psFactory->psAssemblyPoint->factoryInc] : emptyRun;
 					ini.setValue("Factory/productionRuns", (int)productionRun.size());
 					for (int runNum = 0; runNum < productionRun.size(); runNum++)
 					{

diff --git a/src/miscimd.cpp b/src/miscimd.cpp
@@ -138,7 +138,7 @@ iIMDShape	*getRandomDebrisImd( void )
 }
 // -------------------------------------------------------------------------------
 
-iIMDShape	*pAssemblyPointIMDs[NUM_FLAG_TYPES][MAX_FACTORY];
+iIMDShape	*pAssemblyPointIMDs[NUM_FLAG_TYPES][MAX_FACTORY_FLAG_IMDS];
 
 static bool initMiscImd(unsigned i, unsigned n, const char *nameFormat, unsigned flagType)
 {
@@ -156,17 +156,16 @@ static bool initMiscImd(unsigned i, unsigned n, const char *nameFormat, unsigned
 
 bool	initMiscImds( void )
 {
-	unsigned        i;
-
 	/* Do the new loading system */
 	multiLoadMiscImds();
 
 	/* Now load the multi array stuff */
-	for (i=0; i < MAX_FACTORY; i++)
+	for (unsigned i = 0; i < MAX_FACTORY_FLAG_IMDS; ++i)
 	{
 		unsigned n = i + 1;
 
-		STATIC_ASSERT(MAX_FACTORY <= 32);  // Need to add more assembly point graphics, if increasing MAX_FACTORY.
+		STATIC_ASSERT(MAX_FACTORY <= MAX_FACTORY_FLAG_IMDS);
+		STATIC_ASSERT(MAX_FACTORY_FLAG_IMDS <= 32);  // Need to add more assembly point graphics, if increasing MAX_FACTORY_FLAG_IMDS.
 		if (!initMiscImd(i, n, "minum%u.pie",  FACTORY_FLAG) ||
 		    !initMiscImd(i, n, "micnum%u.pie", CYBORG_FLAG) ||
 		    !initMiscImd(i, n, "mivnum%u.pie", VTOL_FLAG) ||

diff --git a/src/miscimd.h b/src/miscimd.h
@@ -48,8 +48,8 @@ extern iIMDShape	*waterImd;
 extern iIMDShape	*droidDamageImd;
 extern iIMDShape	*smallSteamImd;
 extern iIMDShape	*plasmaImd;
-//extern iIMDShape	*pAssemblyPointIMDs[NUM_FACTORY_TYPES][MAX_FACTORY];
-extern iIMDShape	*pAssemblyPointIMDs[NUM_FLAG_TYPES][MAX_FACTORY];
+#define MAX_FACTORY_FLAG_IMDS 32
+extern iIMDShape	*pAssemblyPointIMDs[NUM_FLAG_TYPES][MAX_FACTORY_FLAG_IMDS];
 extern iIMDShape	*blipImd;
 extern iIMDShape	*shadowImd;
 extern iIMDShape	*transporterShadowImd;

diff --git a/src/objmem.cpp b/src/objmem.cpp
@@ -46,10 +46,6 @@
 #include "visibility.h"
 #include "qtscript.h"
 
-#ifdef DEBUG
-static SDWORD factoryDeliveryPointCheck[MAX_PLAYERS][NUM_FLAG_TYPES][MAX_FACTORY];
-#endif
-
 // the initial value for the object ID
 #define OBJ_ID_INIT 20000
 
@@ -700,38 +696,34 @@ void freeAllFlagPositions(void)
 // check all flag positions for duplicate delivery points
 void checkFactoryFlags(void)
 {
-	FLAG_POSITION	*psFlag;
-	SDWORD			player, type, factory;
+	static std::vector<unsigned> factoryDeliveryPointCheck[NUM_FLAG_TYPES];  // Static to save allocations.
 
-	//clear the check array
-	for(player=0; player<MAX_PLAYERS; player++)
+	//check the flags
+	for (unsigned player = 0; player < MAX_PLAYERS; ++player)
 	{
-		//for(type=0; type<NUM_FACTORY_TYPES; type++)
-        for(type=0; type<NUM_FLAG_TYPES; type++)
+		//clear the check array
+		for (int type = 0; type < NUM_FLAG_TYPES; ++type)
 		{
-			for(factory=0; factory<MAX_FACTORY; factory++)
-			{
-				factoryDeliveryPointCheck[player][type][factory] = 0;
-			}
+			factoryDeliveryPointCheck[type].clear();
 		}
-	}
 
-	//check the flags
-	for(player=0; player<MAX_PLAYERS; player++)
-	{
-		psFlag = apsFlagPosLists[player];
+		FLAG_POSITION *psFlag = apsFlagPosLists[player];
 		while (psFlag)
 		{
 			if ((psFlag->type == POS_DELIVERY) &&//check this is attached to a unique factory
 				(psFlag->factoryType != REPAIR_FLAG))
 			{
-				type = psFlag->factoryType;
-				factory = psFlag->factoryInc;
-				ASSERT( factoryDeliveryPointCheck[player][type][factory] == 0,"DUPLICATE FACTORY DELIVERY POINT FOUND" );
-				factoryDeliveryPointCheck[player][type][factory] = 1;
+				unsigned type = psFlag->factoryType;
+				unsigned factory = psFlag->factoryInc;
+				factoryDeliveryPointCheck[type].push_back(factory);
 			}
 			psFlag = psFlag->psNext;
 		}
+		for (int type = 0; type < NUM_FLAG_TYPES; ++type)
+		{
+			std::sort(factoryDeliveryPointCheck[type].begin(), factoryDeliveryPointCheck[type].end());
+			ASSERT(std::unique(factoryDeliveryPointCheck[type].begin(), factoryDeliveryPointCheck[type].end()) == factoryDeliveryPointCheck[type].end(), "DUPLICATE FACTORY DELIVERY POINT FOUND");
+		}
 	}
 }
 #endif