Skip to content

Commit

Permalink
Merge pull request #2148 from jaj22/fix-airborne-captures
Browse files Browse the repository at this point in the history
### What type of PR is this.
1. [X] Bug
2. [ ] Change
3. [ ] Enhancement

### What have you changed and why?
Airborne troops, for example overflying in transport helis, counted towards flag recapture checks. This caused some very weird marker flips. This PR prevents airborne troops from counting towards the capture check.

wavedCA probably has a similar issue but it's harder to fix.

### Please specify which Issue this PR Resolves.
closes #2145

### Please verify the following and ensure all checks are completed.
1. [X] Have you loaded the mission in LAN host?
2. [ ] Have you loaded the mission on a dedicated server?

### Is further testing or are further changes required?
1. [X] No
2. [ ] Yes (Please provide further detail below.)
  • Loading branch information
Bob-Murphy authored Oct 2, 2021
2 parents 6e25bd4 + 0884898 commit 7afe743
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions A3-Antistasi/functions/Base/fn_zoneCheck.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ private _markerPos = getMarkerPos _marker;
private _units = allUnits inAreaArray [_markerPos, _capRadius, _capRadius];
{
if !(_x call A3A_fnc_canFight) then { continue };
if (vehicle _x isKindOf "Air") then { continue };
private _value = linearConversion [_capRadius/2, _capRadius, _markerPos distance2d _x, 1, 0, true];
switch (side _x) do // Not side group because we don't count undercover
{
Expand Down

0 comments on commit 7afe743

Please sign in to comment.