diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index 807f45d8..998dbd94 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -2545,8 +2545,6 @@ void UIHandleMercAttack( SOLDIERTYPE *pSoldier , SOLDIERTYPE *pTargetSoldier, IN } } - // Set aim time to one in UI - pSoldier->aiData.bAimTime = (pSoldier->aiData.bShownAimTime ); // ATE: Check if we are targeting an interactive tile, and adjust gridno accordingly... pIntNode = GetCurInteractiveTileGridNoAndStructure( &sGridNo, &pStructure ); @@ -2567,6 +2565,13 @@ void UIHandleMercAttack( SOLDIERTYPE *pSoldier , SOLDIERTYPE *pTargetSoldier, IN } } + // In realtime mode we cannot aim. Assume that max allowed aiming levels will be used. + if ( gTacticalStatus.uiFlags & REALTIME || !( gTacticalStatus.uiFlags & INCOMBAT ) ) + pSoldier->aiData.bAimTime = AllowedAimingLevels(pSoldier, sGridNo); + else + // Set aim time to one in UI + pSoldier->aiData.bAimTime = (pSoldier->aiData.bShownAimTime ); + // here, change gridno if we're targeting ourselves.... if ( pIntNode != NULL ) {