Improved limited target angle behavior

Author: Andreas-W

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

@@ -684,7 +684,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
 #endif
 
 	// this is intended for use ONLY by AIAttackAimAtTargetState.
-	Bool friend_isAttackAngleValid(Real relAngle) const;
+	Bool friend_isAttackAngleValid(Real relAngle, Real angleThresh) const;
 	Real friend_getClosestAttackAngle(Real relAngle) const;
 
 	Object* getGoalObject() { return getStateMachine()->getGoalObject(); }	///< return the id of the current state of the machine

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp

@@ -5103,7 +5103,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 		Real relAngle = m_isAttackingObject ?
 			ThePartitionManager->getRelativeAngle2D(source, victim) :
 			ThePartitionManager->getRelativeAngle2D(source, getMachineGoalPosition());
-		if (sourceAI->friend_isAttackAngleValid(relAngle)) {
+		if (sourceAI->friend_isAttackAngleValid(relAngle, 0.07f * 2)) {  //about 4 degrees threshold
 			//DEBUG_LOG((">>> friend_isAttackAngleValid(%f) = True", relAngle * 180.0 / PI));
 
 			// Workaround for ships TODO: Make this work for everything
@@ -5216,6 +5216,7 @@ StateReturnType AIAttackAimAtTargetState::update()
 		{ // Check our preferred angle on how to move.
 
 			//We ignore AimDelta here.
+			//aimDelta = REL_THRESH * 5;  // about 10 degrees
 			aimDelta = REL_THRESH;
 
 			Real relAttackAngle = sourceAI->friend_getClosestAttackAngle(relAngle);
@@ -5319,8 +5320,8 @@ StateReturnType AIAttackAimAtTargetState::update()
 			}
 		}
 
-		//if (fabs(stdAngleDiff(desiredAngle,relAngle)) < aimDelta /*&& !m_preAttackFrames*/ )
-		if (fabs(relAngle) < aimDelta && !hasPreferredAngle /*&& !m_preAttackFrames*/)
+		if (fabs(stdAngleDiff(desiredAngle,relAngle)) < aimDelta /*&& !m_preAttackFrames*/ )
+		//if (fabs(relAngle) < aimDelta && !hasPreferredAngle /*&& !m_preAttackFrames*/)
 		{
 			AIUpdateInterface* victimAI = victim ? victim->getAI() : nullptr;
 			// add ourself as a targeter BEFORE calling isTemporarilyPreventingAimSuccess().

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

@@ -4862,7 +4862,7 @@ setTmpValue(now);
 
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
-Bool AIUpdateInterface::friend_isAttackAngleValid(Real relAngle) const
+Bool AIUpdateInterface::friend_isAttackAngleValid(Real relAngle, Real angleThresh /*= 0*/) const
 {
 	const AIUpdateModuleData* data = getAIUpdateModuleData();
 	if (data->m_attackAngles.size() <= 0)
@@ -4871,8 +4871,8 @@ Bool AIUpdateInterface::friend_isAttackAngleValid(Real relAngle) const
 	relAngle = normalizeAngle2PI(relAngle);
 
 	for (AttackAngleData angles : data->m_attackAngles) {
-		Real minAngle = angles.m_minAngle;
-		Real maxAngle = angles.m_maxAngle;
+		Real minAngle = angles.m_minAngle - angleThresh;
+		Real maxAngle = angles.m_maxAngle + angleThresh;
 		Real curAngle = relAngle;
 
 		if (minAngle > maxAngle) {

GeneralsMD/Code/Main/WinMain.cpp

@@ -819,9 +819,9 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                       LPSTR lpCmdLine, Int nCmdShow )
 {
 	Int exitcode = 1;
-#ifdef _DEBUG
-	WaitForDebugger(); //in debug build, wait for debugger attachment
-#endif
+//#ifdef _DEBUG
+//	WaitForDebugger(); //in debug build, wait for debugger attachment
+//#endif
 
 #ifdef RTS_PROFILE
   Profile::StartRange("init");