turning improvements (CLAUDE)

Author: Andreas-W

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

@@ -76,7 +76,8 @@ class SpecialAbilityUpdateModuleData : public UpdateModuleData
 	Bool									m_approachRequiresLOS;
   Bool                  m_needToFaceTarget;
   Bool                  m_persistenceRequiresRecharge;
-  Real                  m_facingAngleTolerance;	///< heading delta (radians) considered "facing target" for locomotors that can't turn in place
+  Bool                  m_requiresMoveToTurn;	///< if set, orient by moving toward target (for locomotors that can't turn in place) instead of facing in place
+  Real                  m_facingAngleTolerance;	///< heading delta (radians) considered "facing target" when m_requiresMoveToTurn
 
 	const ParticleSystemTemplate *m_disableFXParticleSystem;
 	AudioEventRTS					m_packSound;
@@ -114,6 +115,7 @@ class SpecialAbilityUpdateModuleData : public UpdateModuleData
 		m_preTriggerUnstealthFrames = 0;
     m_needToFaceTarget = TRUE;
     m_persistenceRequiresRecharge = FALSE;
+    m_requiresMoveToTurn = FALSE;
     m_facingAngleTolerance = 0.1f;	// ~5.7 degrees
 	}
 
@@ -161,6 +163,7 @@ class SpecialAbilityUpdateModuleData : public UpdateModuleData
 			{ "ApproachRequiresLOS",				INI::parseBool,										nullptr, offsetof( SpecialAbilityUpdateModuleData, m_approachRequiresLOS ) },
       { "NeedToFaceTarget",           INI::parseBool,										nullptr, offsetof( SpecialAbilityUpdateModuleData, m_needToFaceTarget ) },
       { "PersistenceRequiresRecharge",INI::parseBool,										nullptr, offsetof( SpecialAbilityUpdateModuleData, m_persistenceRequiresRecharge ) },
+      { "RequiresMoveToTurn",         INI::parseBool,										nullptr, offsetof( SpecialAbilityUpdateModuleData, m_requiresMoveToTurn ) },
       { "FacingAngleTolerance",       INI::parseAngleReal,							nullptr, offsetof( SpecialAbilityUpdateModuleData, m_facingAngleTolerance ) },
 			{ 0, 0, 0, 0 }
 		};

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

@@ -1904,12 +1904,12 @@ Bool SpecialAbilityUpdate::isFacing()
 	{
 		if( !m_facingComplete && m_facingInitiated)
 		{
+			const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
 			Locomotor *loco = ai->getCurLocomotor();
-			if( loco && loco->getMinTurnSpeed() > 0.0f )
+			if( data->m_requiresMoveToTurn && loco && loco->getMinTurnSpeed() > 0.0f )
 			{
 				//This locomotor can't turn in place (e.g. wings); we're moving toward the
 				//target to turn. Consider facing complete once our heading is within tolerance.
-				const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
 				Real relAngle = ThePartitionManager->getRelativeAngle2D( getObject(), &m_targetPos );
 				if( fabs( relAngle ) <= data->m_facingAngleTolerance )
 				{
@@ -1987,11 +1987,11 @@ void SpecialAbilityUpdate::startFacing()
 	}
 	else if( m_targetPos.x || m_targetPos.y || m_targetPos.z ) //It's zero if not used...
 	{
+		const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
 		Locomotor *loco = ai->getCurLocomotor();
-		if( loco && loco->getMinTurnSpeed() > 0.0f )
+		if( data->m_requiresMoveToTurn && loco && loco->getMinTurnSpeed() > 0.0f )
 		{
 			//This locomotor can't turn in place (e.g. wings); facing in place does nothing.
-			const SpecialAbilityUpdateModuleData* data = getSpecialAbilityUpdateModuleData();
 			if( fabs( ThePartitionManager->getRelativeAngle2D( getObject(), &m_targetPos ) ) <= data->m_facingAngleTolerance )
 			{
 				//Already pointed at the target -- no need to move.