Refactor fillStructureList to use std::vector

thiagorb · thiagorb · commit 11541ec9cc57 · 2021-01-30T20:18:26.000+01:00
diff --git a/src/hci.cpp b/src/hci.cpp
@@ -1699,8 +1699,13 @@ static void intAddObjectStats(BASE_OBJECT *psObj, UDWORD id)
 	//determine the Structures that can be built
 	if (objMode == IOBJ_BUILD)
 	{
-		numStatsListEntries = fillStructureList(apsStructStatsList,
-		                                        selectedPlayer, MAXSTRUCTURES - 1, showFavorites);
+		auto structureList = fillStructureList(selectedPlayer, MAXSTRUCTURES - 1, showFavorites);
+		numStatsListEntries = structureList.size();
+		size_t current = 0;
+		for (auto structure: structureList)
+		{
+			apsStructStatsList[current++] = structure;
+		}
 
 		ppsStatsList = (BASE_STATS **)apsStructStatsList;
 	}
diff --git a/src/structure.cpp b/src/structure.cpp
@@ -3841,9 +3841,10 @@ fills the list with Structure that can be built. There is a limit on how many ca
 be built at any one time. Pass back the number available.
 There is now a limit of how many of each type of structure are allowed per mission
 */
-UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD limit, bool showFavorites)
+std::vector<STRUCTURE_STATS *> fillStructureList(UDWORD selectedPlayer, UDWORD limit, bool showFavorites)
 {
-	UDWORD			inc, count;
+	std::vector<STRUCTURE_STATS *> structureList;
+	UDWORD			inc;
 	bool			researchModule, factoryModule, powerModule;
 	STRUCTURE		*psCurr;
 	STRUCTURE_STATS	*psBuilding;
@@ -3871,7 +3872,6 @@ UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD
 		}
 	}
 
-	count = 0;
 	//set the list of Structures to build
 	for (inc = 0; inc < numStructureStats; inc++)
 	{
@@ -3944,15 +3944,15 @@ UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD
 				}
 
 				debug(LOG_NEVER, "adding %s (%x)", getStatsName(psBuilding), apStructTypeLists[selectedPlayer][inc]);
-				ppList[count++] = psBuilding;
-				if (count == limit)
+				structureList.push_back(psBuilding);
+				if (structureList.size() == limit)
 				{
-					return count;
+					return structureList;
 				}
 			}
 		}
 	}
-	return count;
+	return structureList;
 }
 
 
diff --git a/src/structure.h b/src/structure.h
@@ -117,7 +117,7 @@ bool destroyStruct(STRUCTURE *psDel, unsigned impactTime);
 bool removeStruct(STRUCTURE *psDel, bool bDestroy);
 
 //fills the list with Structures that can be built
-UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD limit, bool showFavorites);
+std::vector<STRUCTURE_STATS *> fillStructureList(UDWORD selectedPlayer, UDWORD limit, bool showFavorites);
 
 /// Checks if the two structures would be too close to build together.
 bool isBlueprintTooClose(STRUCTURE_STATS const *stats1, Vector2i pos1, uint16_t dir1, STRUCTURE_STATS const *stats2, Vector2i pos2, uint16_t dir2);

Original file line number	Diff line number	Diff line change
`@@ -3841,9 +3841,10 @@ fills the list with Structure that can be built. There is a limit on how many ca`
`3841`	`3841`	`be built at any one time. Pass back the number available.`
`3842`	`3842`	`There is now a limit of how many of each type of structure are allowed per mission`
`3843`	`3843`	`*/`
`3844`		`-UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD limit, bool showFavorites)`
	`3844`	`+std::vector<STRUCTURE_STATS *> fillStructureList(UDWORD selectedPlayer, UDWORD limit, bool showFavorites)`
`3845`	`3845`	`{`
`3846`		`- UDWORD inc, count;`
	`3846`	`+ std::vector<STRUCTURE_STATS *> structureList;`
	`3847`	`+ UDWORD inc;`
`3847`	`3848`	`bool researchModule, factoryModule, powerModule;`
`3848`	`3849`	`STRUCTURE *psCurr;`
`3849`	`3850`	`STRUCTURE_STATS *psBuilding;`
`@@ -3871,7 +3872,6 @@ UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD`
`3871`	`3872`	`}`
`3872`	`3873`	`}`
`3873`	`3874`
`3874`		`- count = 0;`
`3875`	`3875`	`//set the list of Structures to build`
`3876`	`3876`	`for (inc = 0; inc < numStructureStats; inc++)`
`3877`	`3877`	`{`
`@@ -3944,15 +3944,15 @@ UDWORD fillStructureList(STRUCTURE_STATS **ppList, UDWORD selectedPlayer, UDWORD`
`3944`	`3944`	`}`
`3945`	`3945`
`3946`	`3946`	`debug(LOG_NEVER, "adding %s (%x)", getStatsName(psBuilding), apStructTypeLists[selectedPlayer][inc]);`
`3947`		`- ppList[count++] = psBuilding;`
`3948`		`- if (count == limit)`
	`3947`	`+ structureList.push_back(psBuilding);`
	`3948`	`+ if (structureList.size() == limit)`
`3949`	`3949`	`{`
`3950`		`- return count;`
	`3950`	`+ return structureList;`
`3951`	`3951`	`}`
`3952`	`3952`	`}`
`3953`	`3953`	`}`
`3954`	`3954`	`}`
`3955`		`- return count;`
	`3955`	`+ return structureList;`
`3956`	`3956`	`}`
`3957`	`3957`
`3958`	`3958`