Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent ACEX HC transfer before unloading #479

Merged
merged 10 commits into from
Oct 20, 2019
Merged

Prevent ACEX HC transfer before unloading #479

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e90c48f
Prevent ACEX HC transfer before unloading
ampersand38 Mar 28, 2019
3d8dc4a
Fix quotes in code string
ampersand38 Mar 28, 2019
3d2a68f
State should be set to true when blacklisting
ampersand38 Mar 29, 2019
7b68dec
Update @AresModAchillesExpansion/addons/modules_f_ares/Reinforcements…
neilzar Mar 30, 2019
e78c81f
Merge branch 'master' into patch-1
ampersand38 Apr 4, 2019
ad416aa
Merge branch 'master' into patch-1
Kexanone Apr 7, 2019
28f48cd
Merge branch 'master' into patch-1
ampersand38 Aug 29, 2019
6da31d4
Update fn_ReinforcementsCreateUnits.sqf
ampersand38 Aug 31, 2019
83e31d4
Merge branch 'master' into patch-1
neilzar Sep 23, 2019
e7bf5b2
Merge branch 'master' into patch-1
CreepPork Oct 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ...Expansion/addons/modules_f_ares/Reinforcements/functions/fn_ReinforcementsCreateUnits.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ switch (_groupBehaviour) do

private _rpLogic = [_lzPos, _allRpLogics, _rpAlgorithm] call Achilles_fnc_logicSelector;
private _rpPos = position _rpLogic;
_infantryGroup addWaypoint [_rpPos, _rpSize];
private _infantryRallyWp = _infantryGroup addWaypoint [_rpPos, _rpSize];

// Load the units into the vehicle.
{
Expand Down Expand Up @@ -301,6 +301,19 @@ if (_vehicleBehaviour == 0) then
_vehicleReturnWp setWaypointStatements ["true", "deleteVehicle (vehicle this); {deleteVehicle _x} foreach thisList;"];
};

//Check ACEX Headless Client
if (acex_headless_enabled && {isClass(configFile >> "CfgPatches" >> "acex_headless")}) then
ampersand38 marked this conversation as resolved.
Show resolved Hide resolved
{
//to ensure unload, blacklist
_vehicleGroup setVariable ["acex_headless_blacklist", true, true];
_infantryGroup setVariable ["acex_headless_blacklist", true, true];

//after unload, unblacklist _vehicleGroup
_vehicleUnloadWp setWaypointStatements ["true", "(group this) setVariable ['acex_headless_blacklist', false, true];"];
//after rally, unblacklist _infantryGroup
_infantryRallyWp setWaypointStatements ["true", "(group this) setVariable ['acex_headless_blacklist', false, true];"];
};

// print a confirmation
[localize "STR_AMAE_REINFORCEMENT_DISPATCHED"] call Ares_fnc_showZeusMessage;

Expand Down