[Clean up] Use unique_ptr for CUnitType and use function to get all…

… unittypes.

src/ai/ai.cpp

@@ -552,7 +552,7 @@ static void AiRemoveFromBuilt(PlayerAi &pai, const CUnitType &type)
 	//  This could happen if an upgrade is ready, look for equivalent units.
 	const auto equivalents = AiFindUnitTypeEquiv(type);
 	for (int typeIndex : equivalents) {
-		if (AiRemoveFromBuilt2(pai, *UnitTypes[typeIndex])) {
+		if (AiRemoveFromBuilt2(pai, *getUnitTypes()[typeIndex])) {
 			return;
 		}
 	}
@@ -598,7 +598,7 @@ void AiReduceMadeInBuilt(PlayerAi &pai, const CUnitType &type)
 	const auto equivs = AiFindUnitTypeEquiv(type);
 
 	for (int typeIndex : equivs) {
-		if (AiReduceMadeInBuilt2(pai, *UnitTypes[typeIndex])) {
+		if (AiReduceMadeInBuilt2(pai, *getUnitTypes()[typeIndex])) {
 			return;
 		}
 	}

src/ai/ai_force.cpp

@@ -256,11 +256,11 @@ std::vector<int> AiFindAvailableUnitTypeEquiv(const CUnitType &unittype)
 	auto usableTypes = AiFindUnitTypeEquiv(unittype);
 	// 2 - Remove unavailable unittypes
 	ranges::erase_if(usableTypes, [&](int typeIndex) {
-		return !CheckDependByIdent(*AiPlayer->Player, UnitTypes[typeIndex]->Ident);
+		return !CheckDependByIdent(*AiPlayer->Player, getUnitTypes()[typeIndex]->Ident);
 	});
 	// 3 - Sort by level
 	ranges::sort(usableTypes, std::greater<>(), [](int index) {
-		return UnitTypes[index]->MapDefaultStat.Variables[PRIORITY_INDEX].Value;
+		return getUnitTypes()[index]->MapDefaultStat.Variables[PRIORITY_INDEX].Value;
 	});
 	return usableTypes;
 }

src/ai/ai_resource.cpp

@@ -619,7 +619,7 @@ static bool AiMakeUnit(CUnitType &typeToMake, const Vec2i &nearPos)
 
 	// Iterate them
 	for (int typeIndex : usableTypes) {
-		CUnitType &type = *UnitTypes[typeIndex];
+		CUnitType &type = *getUnitTypes()[typeIndex];
 		//
 		// Check if we have a place for building or a unit to build.
 		//
@@ -932,7 +932,7 @@ static bool AiAssignHarvesterFromUnit(CUnit &unit, int resource)
 
 	int exploremask = 0;
 
-	for (const CUnitType *type : UnitTypes) {
+	for (const CUnitType *type : getUnitTypes()) {
 		if (type && type->GivesResource == resource) {
 			switch (type->MoveType) {
 				case EMovement::Land: exploremask |= MapFieldLandUnit; break;

src/ai/script_ai.cpp

@@ -79,7 +79,7 @@ static std::vector<CUnitType *> getUnitTypeFromString(std::string_view list)
 	std::vector<CUnitType *> res;
 
 	if (list == "*") {
-		return UnitTypes;
+		return getUnitTypes();
 	}
 	size_t begin = 1;
 	size_t end = list.find(",", begin);
@@ -101,7 +101,7 @@ static std::vector<CUnitType *> getReparableUnits()
 {
 	std::vector<CUnitType *> res;
 
-	for (CUnitType *type : UnitTypes) {
+	for (CUnitType *type : getUnitTypes()) {
 		if (type->RepairHP > 0) {
 			res.push_back(type);
 		}
@@ -119,7 +119,7 @@ static std::vector<CUnitType *> getSupplyUnits()
 	std::vector<CUnitType *> res;
 	std::vector<CUnitType *> sorted_res;
 
-	for (CUnitType *type : UnitTypes) {
+	for (CUnitType *type : getUnitTypes()) {
 		if (type->DefaultStat.Variables[SUPPLY_INDEX].Value > 0) { //supply units are identified as being those with a default stat supply of 1 or more; so if a unit has a supply default stat of 0, but through an upgrade ends up having 1 or more supply, it won't be included here
 			res.push_back(type);
 		}
@@ -159,7 +159,7 @@ static std::vector<CUnitType *> getRefineryUnits()
 {
 	std::vector<CUnitType *> res;
 
-	for (CUnitType *type : UnitTypes) {
+	for (CUnitType *type : getUnitTypes()) {
 		if (type->GivesResource > 0 && type->BoolFlag[CANHARVEST_INDEX].value) {
 			res.push_back(type);
 		}
@@ -222,7 +222,7 @@ static void InitAiHelper(AiHelper &aiHelper)
 				AiHelperInsert(aiHelper.Refinery(), i - 1, *type);
 			}
 		}
-		for (CUnitType *type : UnitTypes) {
+		for (CUnitType *type : getUnitTypes()) {
 			if (type->CanStore[i] > 0) {
 				/* HACK : we can't store TIME then use 0 as 1 */
 				AiHelperInsert(aiHelper.Depots(), i - 1, *type);
@@ -872,7 +872,7 @@ static int CclAiForce(lua_State *l)
 		}
 
 		// Use the equivalent unittype.
-		type = UnitTypes[UnitTypeEquivs[type->Slot]];
+		type = getUnitTypes()[UnitTypeEquivs[type->Slot]];
 
 		if (resetForce) {
 			// Append it.

src/game/game.cpp

@@ -388,7 +388,7 @@ static bool WriteMapSetup(const fs::path &mapSetup, CMap &map, int writeTerrain,
 		}
 
 		f->printf("\n-- set map default stat and map sound for unit types\n");
-		for (const CUnitType *typePtr : UnitTypes) {
+		for (const CUnitType *typePtr : getUnitTypes()) {
 			const CUnitType &type = *typePtr;
 			for (unsigned int j = 0; j < MaxCosts; ++j) {
 				if (type.MapDefaultStat.Costs[j] != type.DefaultStat.Costs[j]) {

src/include/unittype.h

@@ -56,10 +56,11 @@
 #include "util.h"
 #include "vec2i.h"
 
-#include <climits>
-#include <vector>
 #include <algorithm>
+#include <climits>
 #include <map>
+#include <memory>
+#include <vector>
 
 /*----------------------------------------------------------------------------
 --  Declarations
@@ -720,7 +721,7 @@ class CUnitType
 --  Variables
 ----------------------------------------------------------------------------*/
 
-extern std::vector<CUnitType *> UnitTypes;   /// All unit-types
+const std::vector<CUnitType *> &getUnitTypes(); /// All unit-types
 
 /// @todo this hardcoded unit-types must be removed!!
 extern CUnitType *UnitTypeHumanWall;  /// Human wall

src/network/commands.cpp

@@ -672,8 +672,15 @@ void ExecCommand(unsigned char msgnr, UnitRef unum,
 			break;
 		}
 		case MessageCommandBuild:
-			CommandLog("build", &unit, flush, pos.x, pos.y, nullptr, UnitTypes[dstnr]->Ident.c_str(), -1);
-			CommandBuildBuilding(unit, pos, *UnitTypes[dstnr], flush);
+			CommandLog("build",
+			           &unit,
+			           flush,
+			           pos.x,
+			           pos.y,
+			           nullptr,
+			           getUnitTypes()[dstnr]->Ident.c_str(),
+			           -1);
+			CommandBuildBuilding(unit, pos, *getUnitTypes()[dstnr], flush);
 			break;
 		case MessageCommandExplore:
 			CommandLog("explore", &unit, flush, -1, -1, nullptr, nullptr, -1);
@@ -703,24 +710,27 @@ void ExecCommand(unsigned char msgnr, UnitRef unum,
 			break;
 		}
 		case MessageCommandTrain:
-			CommandLog("train", &unit, flush, -1, -1, nullptr, UnitTypes[dstnr]->Ident.c_str(), -1);
-			CommandTrainUnit(unit, *UnitTypes[dstnr], flush);
+			CommandLog(
+				"train", &unit, flush, -1, -1, nullptr, getUnitTypes()[dstnr]->Ident.c_str(), -1);
+			CommandTrainUnit(unit, *getUnitTypes()[dstnr], flush);
 			break;
 		case MessageCommandCancelTrain:
 			// We need (short)x for the last slot -1
 			if (dstnr != (unsigned short)0xFFFF) {
 				CommandLog("cancel-train", &unit, EFlushMode::On, -1, -1, nullptr,
-						   UnitTypes[dstnr]->Ident.c_str(), (short)x);
-				CommandCancelTraining(unit, (short)x, UnitTypes[dstnr]);
+				           getUnitTypes()[dstnr]->Ident.c_str(),
+				           (short) x);
+				CommandCancelTraining(unit, (short) x, getUnitTypes()[dstnr]);
 			} else {
 				CommandLog("cancel-train", &unit, EFlushMode::On, -1, -1, nullptr, nullptr, (short)x);
 				CommandCancelTraining(unit, (short)x, nullptr);
 			}
 			break;
 		case MessageCommandUpgrade:
 			CommandLog("upgrade-to", &unit, flush, -1, -1, nullptr,
-					   UnitTypes[dstnr]->Ident.c_str(), -1);
-			CommandUpgradeTo(unit, *UnitTypes[dstnr], flush);
+			           getUnitTypes()[dstnr]->Ident.c_str(),
+			           -1);
+			CommandUpgradeTo(unit, *getUnitTypes()[dstnr], flush);
 			break;
 		case MessageCommandCancelUpgrade:
 			CommandLog("cancel-upgrade-to", &unit, EFlushMode::On, -1, -1, nullptr, nullptr, -1);

src/sound/unitsound.cpp

@@ -129,7 +129,7 @@ void MapUnitSounds()
 		return;
 	}
 	// Parse all units sounds.
-	for (CUnitType *typePtr : UnitTypes) {
+	for (CUnitType *typePtr : getUnitTypes()) {
 		CUnitType &type = *typePtr;
 
 		MapAnimSounds(type);

src/spell/script_spell.cpp

@@ -344,7 +344,7 @@ static int CclDefineSpell(lua_State *l)
 	} else {
 		SpellTypeTable.push_back(std::make_unique<SpellType>(SpellTypeTable.size(), std::string{identname}));
 		spell = SpellTypeTable.back().get();
-		for (CUnitType *unitType : UnitTypes) { // adjust array for caster already defined
+		for (CUnitType *unitType : getUnitTypes()) { // adjust array for caster already defined
 			if (!unitType->CanCastSpell.empty()) {
 				unitType->CanCastSpell.resize(SpellTypeTable.size());
 			}

src/ui/botpanel.cpp

@@ -363,7 +363,7 @@ static void GetPopupSize(const CPopup &popup, const ButtonAction &button,
 	for (auto &contentPtr : popup.Contents) {
 		CPopupContentType &content = *contentPtr;
 
-		if (CanShowPopupContent(content.Condition.get(), button, UnitTypes[button.Value])) {
+		if (CanShowPopupContent(content.Condition.get(), button, getUnitTypes()[button.Value])) {
 			// Automatically write the calculated coordinates.
 			content.pos.x = contentWidth + content.MarginX;
 			content.pos.y = popupHeight + content.MarginY;
@@ -543,9 +543,13 @@ void DrawPopup(const ButtonAction &button, const CUIButton &uibutton, int x, int
 		case ButtonCmd::Build:
 		case ButtonCmd::Train:
 		case ButtonCmd::UpgradeTo:
-			memcpy(Costs, UnitTypes[button.Value]->Stats[ThisPlayer->Index].Costs,
-				   sizeof(UnitTypes[button.Value]->Stats[ThisPlayer->Index].Costs));
-			Costs[FoodCost] = UnitTypes[button.Value]->Stats[ThisPlayer->Index].Variables[DEMAND_INDEX].Value;
+			memcpy(Costs,
+			       getUnitTypes()[button.Value]->Stats[ThisPlayer->Index].Costs,
+			       sizeof(getUnitTypes()[button.Value]->Stats[ThisPlayer->Index].Costs));
+			Costs[FoodCost] = getUnitTypes()[button.Value]
+			                      ->Stats[ThisPlayer->Index]
+			                      .Variables[DEMAND_INDEX]
+			                      .Value;
 			break;
 		default:
 			break;
@@ -575,7 +579,7 @@ void DrawPopup(const ButtonAction &button, const CUIButton &uibutton, int x, int
 	for (auto &contentPtr : popup.Contents) {
 		const CPopupContentType &content = *contentPtr;
 
-		if (CanShowPopupContent(content.Condition.get(), button, UnitTypes[button.Value])) {
+		if (CanShowPopupContent(content.Condition.get(), button, getUnitTypes()[button.Value])) {
 			content.Draw(x + content.pos.x, y + content.pos.y, popup, popupWidth, button, Costs);
 		}
 	}
@@ -801,7 +805,7 @@ void UpdateStatusLineForButton(const ButtonAction &button)
 		case ButtonCmd::Train:
 		case ButtonCmd::UpgradeTo: {
 			// FIXME: store pointer in button table!
-			const CUnitStats &stats = UnitTypes[button.Value]->Stats[ThisPlayer->Index];
+			const CUnitStats &stats = getUnitTypes()[button.Value]->Stats[ThisPlayer->Index];
 			UI.StatusLine.SetCosts(0, stats.Variables[DEMAND_INDEX].Value, stats.Costs);
 			break;
 		}
@@ -1236,7 +1240,7 @@ void CButtonPanel::DoClicked_CancelBuild()
 void CButtonPanel::DoClicked_Build(int button)
 {
 	// FIXME: store pointer in button table!
-	CUnitType &type = *UnitTypes[CurrentButtons[button].Value];
+	CUnitType &type = *getUnitTypes()[CurrentButtons[button].Value];
 	if (!Selected[0]->Player->CheckUnitType(type)) {
 		UI.StatusLine.Set(_("Select Location"));
 		UI.StatusLine.ClearCosts();
@@ -1250,7 +1254,7 @@ void CButtonPanel::DoClicked_Build(int button)
 void CButtonPanel::DoClicked_Train(int button)
 {
 	// NEW CODE FOR CButtonPanel::DoClicked_Train(int button)
-	CUnitType &type = *UnitTypes[CurrentButtons[button].Value];
+	CUnitType &type = *getUnitTypes()[CurrentButtons[button].Value];
 	int best_training_place = 0;
 	int lowest_queue = Selected[0]->Orders.size();
 
@@ -1285,7 +1289,7 @@ void CButtonPanel::DoClicked_Train(int button)
 void CButtonPanel::DoClicked_UpgradeTo(int button)
 {
 	// FIXME: store pointer in button table!
-	CUnitType &type = *UnitTypes[CurrentButtons[button].Value];
+	CUnitType &type = *getUnitTypes()[CurrentButtons[button].Value];
 	const EFlushMode flush = !(KeyModifiers & ModifierShift) ? EFlushMode::On : EFlushMode::Off;
 	for (CUnit *unit : Selected) {
 		if (Selected[0]->Player->CheckLimits(type) != ECheckLimit::SpecificUnitLimitReached

src/ui/popup.cpp

@@ -371,7 +371,7 @@ void CPopupContentTypeLine::Parse(lua_State *l) /* override */
 int CPopupContentTypeVariable::GetWidth(const ButtonAction &button, int *) const /* override */
 {
 	CFont &font = this->Font ? *this->Font : GetSmallFont();
-	TriggerData.Type = UnitTypes[button.Value];
+	TriggerData.Type = getUnitTypes()[button.Value];
 	std::string text = EvalString(*this->Text);
 	TriggerData.Type = nullptr;
 	return font.getWidth(text);
@@ -398,7 +398,7 @@ void CPopupContentTypeVariable::Draw(int x,
 	CLabel label(font, this->TextColor, this->HighlightColor);
 
 	if (this->Text) {
-		TriggerData.Type = UnitTypes[button.Value];
+		TriggerData.Type = getUnitTypes()[button.Value];
 		text = EvalString(*this->Text);
 		TriggerData.Type = nullptr;
 		if (this->Centered) {
@@ -409,7 +409,7 @@ void CPopupContentTypeVariable::Draw(int x,
 	}
 
 	if (this->Index != -1) {
-		CUnitType &type = *UnitTypes[button.Value];
+		CUnitType &type = *getUnitTypes()[button.Value];
 		int value = type.DefaultStat.Variables[this->Index].Value;
 		int diff = type.Stats[ThisPlayer->Index].Variables[this->Index].Value - value;
 

src/unit/script_unittype.cpp

@@ -1532,11 +1532,12 @@ static int CclUnitTypeArray(lua_State *l)
 
 	lua_newtable(l);
 
-	for (std::vector<CUnitType *>::size_type i = 0; i < UnitTypes.size(); ++i) {
+	std::size_t i = 1;
+	for (auto type : getUnitTypes()) {
 		LuaUserData *data = (LuaUserData *)lua_newuserdata(l, sizeof(LuaUserData));
 		data->Type = LuaUnitType;
-		data->Data = UnitTypes[i];
-		lua_rawseti(l, 1, i + 1);
+		data->Data = type;
+		lua_rawseti(l, 1, i++);
 	}
 	return 1;
 }
@@ -1908,7 +1909,7 @@ static int CclDefineBoolFlags(lua_State *l)
 
 	if (0 < old && old != UnitTypeVar.GetNumberBoolFlag()) {
 		size_t new_size = UnitTypeVar.GetNumberBoolFlag();
-		for (CUnitType *unitType : UnitTypes) { // adjust array for unit already defined
+		for (CUnitType *unitType : getUnitTypes()) { // adjust array for unit already defined
 			unitType->BoolFlag.resize(new_size);
 		}
 	}