Make Enumerable array contiguous again

the madness must end now

Author: chaserli

src/Ext/Bullet/Body.cpp

@@ -150,10 +150,7 @@ void BulletExt::ExtData::InitializeLaserTrails()
 
 		for (auto const& idxTrail : pTypeExt->LaserTrail_Types)
 		{
-			if (auto const pLaserType = LaserTrailTypeClass::Array[idxTrail].get())
-			{
-				this->LaserTrails.push_back(LaserTrailClass { pLaserType, pOwner });
-			}
+			this->LaserTrails.push_back(LaserTrailClass { &LaserTrailTypeClass::Array[idxTrail], pOwner });
 		}
 	}
 }

src/Ext/Techno/Body.Internal.cpp

@@ -15,11 +15,7 @@ void TechnoExt::ExtData::InitializeLaserTrails()
 	{
 		for (auto const& entry : pTypeExt->LaserTrailData)
 		{
-			if (auto const pLaserType = LaserTrailTypeClass::Array[entry.idxType].get())
-			{
-				this->LaserTrails.push_back(
-					LaserTrailClass { pLaserType, this->OwnerObject()->Owner, entry.FLH, entry.IsOnTurret });
-			}
+			this->LaserTrails.emplace_back(entry.GetType(), this->OwnerObject()->Owner, entry.FLH, entry.IsOnTurret);
 		}
 	}
 }

src/Ext/Techno/Body.Update.cpp

@@ -422,11 +422,7 @@ void TechnoExt::ExtData::UpdateTypeData(TechnoTypeClass* pCurrentType)
 	// Recreate Laser Trails
 	for (auto const& entry : this->TypeExtData->LaserTrailData)
 	{
-		if (auto const pLaserType = LaserTrailTypeClass::Array[entry.idxType].get())
-		{
-			this->LaserTrails.push_back(LaserTrailClass {
-				pLaserType, pThis->Owner, entry.FLH, entry.IsOnTurret });
-		}
+		this->LaserTrails.emplace_back(entry.GetType(), pThis->Owner, entry.FLH, entry.IsOnTurret);
 	}
 
 	// Reset AutoDeath Timer

src/Ext/TechnoType/Body.cpp

@@ -845,26 +845,6 @@ void TechnoTypeExt::ExtData::SaveToStream(PhobosStreamWriter& Stm)
 	this->Serialize(Stm);
 }
 
-bool TechnoTypeExt::ExtData::LaserTrailDataEntry::Load(PhobosStreamReader& stm, bool registerForChange)
-{
-	return this->Serialize(stm);
-}
-
-bool TechnoTypeExt::ExtData::LaserTrailDataEntry::Save(PhobosStreamWriter& stm) const
-{
-	return const_cast<LaserTrailDataEntry*>(this)->Serialize(stm);
-}
-
-template <typename T>
-bool TechnoTypeExt::ExtData::LaserTrailDataEntry::Serialize(T& stm)
-{
-	return stm
-		.Process(this->idxType)
-		.Process(this->FLH)
-		.Process(this->IsOnTurret)
-		.Success();
-}
-
 // =============================
 // container
 

src/Ext/TechnoType/Body.h

@@ -234,13 +234,7 @@ class TechnoTypeExt
 			ValueableIdx<LaserTrailTypeClass> idxType;
 			Valueable<CoordStruct> FLH;
 			Valueable<bool> IsOnTurret;
-
-			bool Load(PhobosStreamReader& stm, bool registerForChange);
-			bool Save(PhobosStreamWriter& stm) const;
-
-		private:
-			template <typename T>
-			bool Serialize(T& stm);
+			LaserTrailTypeClass* GetType() const { return &LaserTrailTypeClass::Array[idxType]; }
 		};
 
 		std::vector<LaserTrailDataEntry> LaserTrailData;

src/Ext/VoxelAnim/Body.cpp

@@ -15,10 +15,7 @@ void VoxelAnimExt::InitializeLaserTrails(VoxelAnimClass* pThis)
 
 	for (auto const& idxTrail : pTypeExt->LaserTrail_Types)
 	{
-		if (auto const pLaserType = LaserTrailTypeClass::Array[idxTrail].get())
-		{
-			pThisExt->LaserTrails.push_back(LaserTrailClass { pLaserType, pThis->OwnerHouse });
-		}
+		pThisExt->LaserTrails.push_back(LaserTrailClass { &LaserTrailTypeClass::Array[idxTrail], pThis->OwnerHouse });
 	}
 }
 

src/Utilities/Enumerable.h

@@ -1,29 +1,24 @@
 #pragma once
 
-#include <Phobos.CRT.h>
 #include "Savegame.h"
 #include "Constructs.h"
 
 #include <algorithm>
-#include <memory>
 #include <vector>
 
-#include <ArrayClasses.h>
 #include <CCINIClass.h>
 #include "Swizzle.h"
 
 template <typename T> class Enumerable
 {
-	typedef std::vector<std::unique_ptr<T>> container_t;
-
 public:
-	static container_t Array;
+	inline static std::vector<T> Array;
 
 	static int FindIndex(const char* Title)
 	{
-		auto result = std::find_if(Array.begin(), Array.end(), [Title](std::unique_ptr<T>& Item)
+		auto result = std::find_if(Array.begin(), Array.end(), [Title](const T& Item)
 			{
-				return !_strcmpi(Item->Name, Title);
+				return !_strcmpi(Item.Name, Title);
 			});
 
 		if (result == Array.end())
@@ -35,17 +30,17 @@ template <typename T> class Enumerable
 	static T* Find(const char* Title)
 	{
 		auto result = FindIndex(Title);
-		return (result < 0) ? nullptr : Array[static_cast<size_t>(result)].get();
+		return (result < 0) ? nullptr : &Array[static_cast<size_t>(result)];
 	}
 
 	static T* FindOrAllocate(const char* Title)
 	{
-		if (T* find = Find(Title))
-			return find;
-
-		Array.push_back(std::make_unique<T>(Title));
+		if (T* found = Find(Title))
+			return found;
+		static_assert(std::constructible_from<T, const char*>);
+		Array.emplace_back(Title);
 
-		return Array.back().get();
+		return &Array.back();
 	}
 
 	static void Clear()
@@ -64,8 +59,8 @@ template <typename T> class Enumerable
 				FindOrAllocate(Phobos::readBuffer);
 		}
 
-		for (const auto& item : Array)
-			item->LoadFromINI(pINI);
+		for (auto& item : Array)
+			item.LoadFromINI(pINI);
 	}
 
 	static bool LoadGlobals(PhobosStreamReader& Stm)
@@ -98,12 +93,12 @@ template <typename T> class Enumerable
 	{
 		Stm.Save(Array.size());
 
-		for (const auto& item : Array)
+		for (auto& item : Array)
 		{
 			// write old pointer and name, then delegate
-			Stm.Save(item.get());
-			Stm.Save(item->Name);
-			item->SaveToStream(Stm);
+			Stm.Save(&item);
+			Stm.Save(item.Name);
+			item.SaveToStream(Stm);
 		}
 
 		return true;
@@ -124,6 +119,3 @@ template <typename T> class Enumerable
 
 	PhobosFixedString<32> Name;
 };
-
-template <typename T>
-Enumerable<T>::container_t Enumerable<T>::Array;