Merge pull request #553 from Wargus/clean_up

Use `std::vector` for `AiForce::CountTypes()`.
Wargus · Nov 10, 2023 · 28c03b7 · 28c03b7
2 parents 6da5e26 + c60306f
commit 28c03b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/ai/ai_force.cpp b/src/ai/ai_force.cpp
@@ -290,13 +290,14 @@ std::vector<int> AiFindAvailableUnitTypeEquiv(const CUnitType &unittype)
 
 /* =========================== FORCES ========================== */
 
-void AiForce::CountTypes(unsigned int *counter, const size_t len)
+std::vector<std::size_t> AiForce::CountTypes() const
 {
-	memset(counter, 0, len);
+	std::vector<std::size_t> res(UnitTypeMax + 1);
 	for (CUnit* unit : Units)
 	{
-		counter[UnitTypeEquivs[unit->Type->Slot]]++;
+		res[UnitTypeEquivs[unit->Type->Slot]]++;
 	}
+	return res;
 }
 
 /**
@@ -309,10 +310,7 @@ void AiForce::CountTypes(unsigned int *counter, const size_t len)
 bool AiForce::IsBelongsTo(const CUnitType &type)
 {
 	bool flag = false;
-	unsigned int counter[UnitTypeMax + 1];
-
-	// Count units in force.
-	CountTypes(counter, sizeof(counter));
+	auto counter = CountTypes();
 
 	// Look what should be in the force.
 	Completed = true;

diff --git a/src/ai/ai_local.h b/src/ai/ai_local.h
@@ -166,7 +166,7 @@ class AiForce
 	void Insert(CUnit &unit);
 
 private:
-	void CountTypes(unsigned int *counter, const size_t len);
+	std::vector<std::size_t> CountTypes() const;
 	bool IsBelongsTo(const CUnitType &type);
 
 	void Update();