fix turning in place behavior

Author: Andreas-W

GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h

@@ -264,6 +264,7 @@ class Locomotor : public MemoryPoolObject, public Snapshot
 
 	AsciiString getTemplateName() const { return m_template->m_name;}
 	Real getMinSpeed() const { return m_template->m_minSpeed;}
+	Real getMinTurnSpeed() const { return m_template->m_minTurnSpeed;}	///< must be going >= this speed to turn (0 = can turn in place)
 	Real getAccelPitchLimit() const { return m_template->m_accelPitchLimit;}	///< Maximum amount we will pitch up or down under acceleration (including recoil.)
 	Real getDecelPitchLimit() const { return m_template->m_decelPitchLimit;}	///< Maximum amount we will pitch down under deceleration (including recoil.)
 	Real getBounceKick() const { return m_template->m_bounceKick;}						///< How much simulating rough terrain "bounces" a wheel up.

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

@@ -76,6 +76,7 @@ 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
 
 	const ParticleSystemTemplate *m_disableFXParticleSystem;
 	AudioEventRTS					m_packSound;
@@ -113,6 +114,7 @@ class SpecialAbilityUpdateModuleData : public UpdateModuleData
 		m_preTriggerUnstealthFrames = 0;
     m_needToFaceTarget = TRUE;
     m_persistenceRequiresRecharge = FALSE;
+    m_facingAngleTolerance = 0.1f;	// ~5.7 degrees
 	}
 
 	static void buildFieldParse(MultiIniFieldParse& p)
@@ -159,6 +161,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 ) },
+      { "FacingAngleTolerance",       INI::parseAngleReal,							nullptr, offsetof( SpecialAbilityUpdateModuleData, m_facingAngleTolerance ) },
 			{ 0, 0, 0, 0 }
 		};
     p.add(dataFieldParse);

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

@@ -50,6 +50,7 @@
 
 #include "GameLogic/AIPathfind.h"
 #include "GameLogic/GameLogic.h"
+#include "GameLogic/Locomotor.h"
 #include "GameLogic/Object.h"
 #include "GameLogic/PartitionManager.h"
 #include "GameLogic/Weapon.h"
@@ -1903,6 +1904,23 @@ Bool SpecialAbilityUpdate::isFacing()
 	{
 		if( !m_facingComplete && m_facingInitiated)
 		{
+			Locomotor *loco = ai->getCurLocomotor();
+			if( 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 )
+				{
+					m_facingComplete = true;
+					ai->aiIdle( CMD_FROM_AI );	//stop the short move; ready to launch
+					return false;
+				}
+				//Still turning (while moving).
+				return true;
+			}
+
 			if( ai->isIdle() )
 			{
 				//We finished facing the target
@@ -1969,7 +1987,26 @@ void SpecialAbilityUpdate::startFacing()
 	}
 	else if( m_targetPos.x || m_targetPos.y || m_targetPos.z ) //It's zero if not used...
 	{
-		ai->aiFacePosition( &m_targetPos, CMD_FROM_AI );
+		Locomotor *loco = ai->getCurLocomotor();
+		if( 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.
+				m_facingComplete = true;
+			}
+			else
+			{
+				//Move toward the target so the locomotor turns us; isFacing() stops us once aligned.
+				ai->aiMoveToPosition( &m_targetPos, CMD_FROM_AI );
+			}
+		}
+		else
+		{
+			ai->aiFacePosition( &m_targetPos, CMD_FROM_AI );
+		}
 	}
 }