unify: Parse template references in the AssistedTargetingUpdate module by name

Author: Stubbjax

Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h

@@ -38,15 +38,16 @@ class AssistedTargetingUpdateModuleData : public UpdateModuleData
 public:
 	Int m_clipSize;
 	WeaponSlotType m_weaponSlot;
-	ThingTemplate *m_laserFromAssisted;
-	ThingTemplate *m_laserToTarget;
+
+  AsciiString m_laserFromAssistedName;
+  AsciiString m_laserToTargetName;
 
 	AssistedTargetingUpdateModuleData()
 	{
 		m_clipSize = 1;
 		m_weaponSlot = PRIMARY_WEAPON;
-		m_laserFromAssisted = nullptr;
-		m_laserToTarget = nullptr;
+    m_laserFromAssistedName.clear();
+    m_laserToTargetName.clear();
 	}
 
 	static void buildFieldParse(MultiIniFieldParse& p);
@@ -72,4 +73,7 @@ class AssistedTargetingUpdate : public UpdateModule
 
 private:
 	void makeFeedbackLaser( const ThingTemplate *laserTemplate, const Object *from, const Object *to );
+
+	const ThingTemplate *m_laserFromAssisted;
+	const ThingTemplate *m_laserToTarget;
 };

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp

@@ -54,8 +54,8 @@ void AssistedTargetingUpdateModuleData::buildFieldParse(MultiIniFieldParse& p)
 	{
 		{ "AssistingClipSize",		INI::parseInt,		nullptr, offsetof( AssistedTargetingUpdateModuleData, m_clipSize ) },
 		{ "AssistingWeaponSlot",	INI::parseLookupList,	TheWeaponSlotTypeNamesLookupList, offsetof( AssistedTargetingUpdateModuleData, m_weaponSlot ) },
-		{ "LaserFromAssisted",		INI::parseThingTemplate,				nullptr, offsetof( AssistedTargetingUpdateModuleData, m_laserFromAssisted ) },
-		{ "LaserToTarget",				INI::parseThingTemplate,				nullptr, offsetof( AssistedTargetingUpdateModuleData, m_laserToTarget ) },
+		{ "LaserFromAssisted",		INI::parseAsciiString,				nullptr, offsetof( AssistedTargetingUpdateModuleData, m_laserFromAssistedName ) },
+		{ "LaserToTarget",				INI::parseAsciiString,				nullptr, offsetof( AssistedTargetingUpdateModuleData, m_laserToTargetName ) },
 		{ nullptr, nullptr, nullptr, 0 }
 	};
   p.add(dataFieldParse);
@@ -100,10 +100,10 @@ void AssistedTargetingUpdate::assistAttack( const Object *requestingObject, Obje
 	me->setWeaponLock( md->m_weaponSlot, LOCKED_TEMPORARILY );
 	me->getAI()->aiAttackObject( victimObject, md->m_clipSize, CMD_FROM_AI );
 
-	if( md->m_laserFromAssisted )
-		makeFeedbackLaser( md->m_laserFromAssisted, requestingObject, me );
-	if( md->m_laserToTarget )
-		makeFeedbackLaser( md->m_laserToTarget, me, victimObject );
+	if( m_laserFromAssisted )
+		makeFeedbackLaser( m_laserFromAssisted, requestingObject, me );
+	if( m_laserToTarget )
+		makeFeedbackLaser( m_laserToTarget, me, victimObject );
 }
 
 //-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h

@@ -76,6 +76,4 @@ class AssistedTargetingUpdate : public UpdateModule
 
 	const ThingTemplate *m_laserFromAssisted;
 	const ThingTemplate *m_laserToTarget;
-
-
 };

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp

@@ -101,7 +101,6 @@ void AssistedTargetingUpdate::assistAttack( const Object *requestingObject, Obje
 	me->setWeaponLock( md->m_weaponSlot, LOCKED_TEMPORARILY );
 	me->getAI()->aiAttackObject( victimObject, md->m_clipSize, CMD_FROM_AI );
 
-
 	if( m_laserFromAssisted )
 		makeFeedbackLaser( m_laserFromAssisted, requestingObject, me );
 	if( m_laserToTarget )