Replicate in Generals

Author: xezon

Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h

@@ -42,8 +42,14 @@
 	#undef SPARSEMATCH_DEBUG
 #endif
 
+typedef UnsignedInt SparseMatchFinderFlags;
+enum SparseMatchFinderFlags_ CPP_11(: SparseMatchFinderFlags)
+{
+	SparseMatchFinderFlags_NoCopy = 1<<0,
+};
+
 //-------------------------------------------------------------------------------------------------
-template<class MATCHABLE, class BITSET>
+template<class MATCHABLE, class BITSET, SparseMatchFinderFlags FLAGS = 0>
 class SparseMatchFinder
 {
 private:
@@ -183,9 +189,29 @@ class SparseMatchFinder
 		return result;
 	}
 
-	//-------------------------------------------------------------------------------------------------
 public:
 
+
+	//-------------------------------------------------------------------------------------------------
+	SparseMatchFinder() {}
+	SparseMatchFinder(const SparseMatchFinder& other)
+	{
+		*this = other;
+	}
+
+	//-------------------------------------------------------------------------------------------------
+	SparseMatchFinder& operator=(const SparseMatchFinder& other)
+	{
+		if CONSTEXPR ((FLAGS & SparseMatchFinderFlags_NoCopy) == 0)
+		{
+			if (this != &other)
+			{
+				m_bestMatches = other.m_bestMatches;
+			}
+		}
+		return *this;
+	}
+
 	//-------------------------------------------------------------------------------------------------
 	void clear()
 	{

Generals/Code/GameEngine/Include/Common/ThingTemplate.h

@@ -681,6 +681,11 @@ class ThingTemplate : public Overridable
 	//Code renderer handles these states now.
 	//AsciiString							m_inventoryImage[ INV_IMAGE_NUM_IMAGES ];  ///< portrait inventory pictures
 
+	// TheSuperHackers @bugfix Caball009/xezon 06/07/2025 No longer copy SparseMatchFinder to prevent copied instances linking to unrelated data.
+	// This avoids mismatching in certain maps, for example those that spawn units with veterancy.
+	typedef SparseMatchFinder<WeaponTemplateSet, WeaponSetFlags, SparseMatchFinderFlags_NoCopy> WeaponTemplateSetFinder;
+	typedef SparseMatchFinder<ArmorTemplateSet, ArmorSetFlags, SparseMatchFinderFlags_NoCopy> ArmorTemplateSetFinder;
+
 	// ---- STL-sized things
 	std::vector<ProductionPrerequisite>	m_prereqInfo;				///< the unit Prereqs for this tech
 	std::vector<AsciiString>						m_buildVariations;	/**< if we build a unit of this type via script or ui, randomly choose one

Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h

@@ -94,7 +94,4 @@ class ArmorTemplateSet
 //-------------------------------------------------------------------------------------------------
 typedef std::vector<ArmorTemplateSet> ArmorTemplateSetVector;
 
-//-------------------------------------------------------------------------------------------------
-typedef SparseMatchFinder<ArmorTemplateSet, ArmorSetFlags> ArmorTemplateSetFinder;
-
 #endif	// _ArmorSet_H_

Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h

@@ -146,9 +146,6 @@ class WeaponTemplateSet
 //-------------------------------------------------------------------------------------------------
 typedef std::vector<WeaponTemplateSet> WeaponTemplateSetVector;
 
-//-------------------------------------------------------------------------------------------------
-typedef SparseMatchFinder<WeaponTemplateSet, WeaponSetFlags> WeaponTemplateSetFinder;
-
 //-------------------------------------------------------------------------------------------------
 enum WeaponChoiceCriteria CPP_11(: Int)
 {