Skip to content

Commit b3c2b0d

Browse files
author
TheTrainDoctor
authored
1.0.6 Warmfix (#128)
* Fix Acre Channel bug, Export Formatting * Add ACRE Vehicle Preset to vehicle variables * Fix duplicate Briefing * Fix itemRandomOrg error * Fix Endscreen client side * Fix JIP bug, JIP teleport to vehicles * Add build number * Add AI Driver logging * Fix aiDrivers * Make game-mastering dependent on mission notes * Add force removal for vehicle teleport action in edge cases * Fix for wrong ACRE channels being set (#131)
1 parent e3262d8 commit b3c2b0d

File tree

28 files changed

+412
-217
lines changed

28 files changed

+412
-217
lines changed

‎uo_sys_framework/ACREModule/cfgAttributeCategories/Object.hpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,24 @@ class EGVAR(ACRE,UnitOptions) {
102102
condition = "objectControllable";
103103
defaultValue = "'None'";
104104
};
105+
class EGVAR(ACRE,VehicleACRE_Enabled) {
106+
property = QEGVAR(ACRE,VehicleACRE_Enabled);
107+
displayName = "Enable ACRE Vehicle Settings";
108+
tooltip = "Enable ACRE Vehicle Settings";
109+
control = "CheckBox";
110+
expression = ENTITY_EXPRESSION;
111+
condition = "objectVehicle";
112+
defaultValue = "false";
113+
};
114+
class EGVAR(ACRE,VehicleACREPreset) {
115+
property = QEGVAR(ACRE,VehicleACREPreset);
116+
displayName = "Vehicle Rack Preset";
117+
tooltip = "Will set the vehicles ACRE rack to the selected side. Selecting Default will skip this setting. Requires ACRE Scrambling to be enabled.";
118+
control = QEGVAR(ACRE,VehicleRadioPresetAttribute);
119+
typeName = "STRING";
120+
expression = ENTITY_EXPRESSION;
121+
condition = "objectVehicle";
122+
defaultValue = "''";
123+
};
105124
};
106125
};

‎uo_sys_framework/ACREModule/cfgAttributes.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "CfgAttributes\EarSettingAttribute.hpp"
22
#include "CfgAttributes\RadioSelectAttribute.hpp"
33
#include "CfgAttributes\ChannelSelectAttribute.hpp"
4-
#include "CfgAttributes\AdditionalLanguageAttribute.hpp"
4+
#include "CfgAttributes\AdditionalLanguageAttribute.hpp"
5+
#include "CfgAttributes\VehicleRadioPresetAttribute.hpp"

‎uo_sys_framework/ACREModule/cfgAttributes/VehicleRadioPresetAttribute.hpp

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
class EGVAR(ACRE,VehicleRadioPresetAttribute): Combo {
2+
//save the lbData from the selected entry upon exit
3+
attributeSave = "\
4+
private _value = ((_this controlsGroupCtrl 100) lbData lbCurSel (_this controlsGroupCtrl 100));\
5+
private _unit = ((get3denselected 'object') select 0);\
6+
private _name = gettext (_config >> 'property');\
7+
_unit setvariable [_name,_value];\
8+
_value\
9+
";
10+
//_this - config, _value - saved value
11+
attributeLoad="\
12+
private _control = (_this controlsGroupCtrl 100);\
13+
private _name = gettext (_config >> 'property');\
14+
private _unit = ((get3denselected 'object') select 0);\
15+
private _nameArray = ['Default','Blufor','Opfor','Indfor','Civilian'];\
16+
{\
17+
private _index = _control lbadd _x;\
18+
_control lbsetdata [_index,_x];\
19+
_control lbsetValue [_index,_foreachIndex];\
20+
if (_value isEqualto (_control lbData _index)) then {\
21+
_control lbSetCurSel _index;\
22+
_unit setvariable [_name,_value];\
23+
};\
24+
} foreach _nameArray;\
25+
";
26+
class Controls: Controls {
27+
class Title: Title {};
28+
class Value: Value {};
29+
};
30+
};

‎uo_sys_framework/ACREModule/cfgXEH/PreInit.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
class EGVAR(ACRE,PreInit) {
22
clientInit = "call compile preProcessFileLineNumbers '\x\UO_FW\addons\Main\ACREModule\cfgXEH\init\ClientPreInit.sqf';";
3+
serverInit = "call compile preProcessFileLineNumbers '\x\UO_FW\addons\Main\ACREModule\cfgXEH\init\ServerPreInit.sqf';";
34
};

‎uo_sys_framework/ACREModule/cfgXEH/init/ClientPreInit.sqf

Lines changed: 90 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
3131
//Channel names stuff
3232
LOG("ACRE Init");
3333

34-
_radioNetNamesBlufor = [(GETMVAR(RADIONET_NAME1_Blufor ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Blufor ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Blufor ,"PLTNET 3")),
35-
(GETMVAR(RADIONET_NAME4_Blufor ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Blufor ,"Coy")),(GETMVAR(RADIONET_NAME6_Blufor ,"Cas")),(GETMVAR(RADIONET_NAME7_Blufor ,"Fires"))];
34+
_radioNetNamesBlufor = [(GETMVAR(RADIONET_NAME1_Blufor,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Blufor,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Blufor,"PLTNET 3")),
35+
(GETMVAR(RADIONET_NAME4_Blufor,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Blufor,"Coy")),(GETMVAR(RADIONET_NAME6_Blufor,"Cas")),(GETMVAR(RADIONET_NAME7_Blufor,"Fires"))];
3636

37-
_radioNetNamesOpfor = [(GETMVAR(RADIONET_NAME1_Opfor ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Opfor ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Opfor ,"PLTNET 3")),
38-
(GETMVAR(RADIONET_NAME4_Opfor ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Opfor ,"Coy")),(GETMVAR(RADIONET_NAME6_Opfor ,"Cas")),(GETMVAR(RADIONET_NAME7_Opfor ,"Fires"))];
37+
_radioNetNamesOpfor = [(GETMVAR(RADIONET_NAME1_Opfor,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Opfor,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Opfor,"PLTNET 3")),
38+
(GETMVAR(RADIONET_NAME4_Opfor,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Opfor,"Coy")),(GETMVAR(RADIONET_NAME6_Opfor,"Cas")),(GETMVAR(RADIONET_NAME7_Opfor,"Fires"))];
3939

40-
_radioNetNamesIndfor = [(GETMVAR(RADIONET_NAME1_Indfor ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Indfor ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Indfor ,"PLTNET 3")),
41-
(GETMVAR(RADIONET_NAME4_Indfor ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Indfor ,"Coy")),(GETMVAR(RADIONET_NAME6_Indfor ,"Cas")),(GETMVAR(RADIONET_NAME7_Indfor ,"Fires"))];
40+
_radioNetNamesIndfor = [(GETMVAR(RADIONET_NAME1_Indfor,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Indfor,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Indfor,"PLTNET 3")),
41+
(GETMVAR(RADIONET_NAME4_Indfor,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Indfor,"Coy")),(GETMVAR(RADIONET_NAME6_Indfor,"Cas")),(GETMVAR(RADIONET_NAME7_Indfor,"Fires"))];
4242

43-
_radioNetNamesCiv = [(GETMVAR(RADIONET_NAME1_Civ ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Civ ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Civ ,"PLTNET 3")),
44-
(GETMVAR(RADIONET_NAME4_Civ ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Civ ,"Coy")),(GETMVAR(RADIONET_NAME6_Civ ,"Cas")),(GETMVAR(RADIONET_NAME7_Civ ,"Fires"))];
43+
_radioNetNamesCiv = [(GETMVAR(RADIONET_NAME1_Civ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Civ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Civ,"PLTNET 3")),
44+
(GETMVAR(RADIONET_NAME4_Civ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Civ,"Coy")),(GETMVAR(RADIONET_NAME6_Civ,"Cas")),(GETMVAR(RADIONET_NAME7_Civ,"Fires"))];
4545

4646

4747

@@ -361,49 +361,93 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
361361
}] call CBA_fnc_addEventHandler;
362362

363363
[QGVAR(SetChannelAndEar_Event),{
364+
364365
[{(CBA_missionTime > 1) && {[] call acre_api_fnc_isInitialized}},{
365-
if (GETPLVAR(UnitSettings_Enable,false)) then {
366-
{
367-
private _radioID = [_x] call acre_api_fnc_getRadioByType;
368-
if (!isNil "_radioID") then {
369-
private _result = (GETPLVAR(SR_RADIO_CHANNEL,1));
370-
if (_result < 1) then {
371-
ERROR_1("%1 is not a valid Channel Number",_result);
372-
} else {
373-
[_radioID, _result] call acre_api_fnc_setRadioChannel;
374-
};
375366

376-
[_radioID, (["LEFT","CENTER", "RIGHT"] select (GETPLVAR(SR_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
377-
};
378-
} forEach ["ACRE_PRC343", "ACRE_SEM52SL"];
379367

380-
{
381-
private _radioID = [_x] call acre_api_fnc_getRadioByType;
382-
if ( ! isNil "_radioID") then {
383-
private _result = (GETPLVAR(LR_RADIO_CHANNEL,1));
384-
if (_result < 1) then {
385-
ERROR_1("%1 is not a valid Channel Number",_result);
386-
} else {
387-
[_radioID, _result] call acre_api_fnc_setRadioChannel;
388-
};
389-
[_radioID, ([ "LEFT","CENTER", "RIGHT"] select (GETPLVAR(LR_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
390-
};
391-
} forEach ["ACRE_PRC343", "ACRE_PRC148", "ACRE_PRC152"];
368+
private ["_SRType","_LRType","_PKType"];
369+
switch (side player) do {
370+
case west: {
371+
_SRType = ["NONE","ACRE_PRC343","ACRE_SEM52SL"] select GVAR(SR_Type_BLUFOR);
372+
_LRType = ["NONE","ACRE_PRC343","ACRE_PRC148","ACRE_PRC152"] select GVAR(LR_Type_BLUFOR);
373+
_PKType = ["NONE","ACRE_PRC117F","ACRE_PRC77","ACRE_SEM70"] select GVAR(PK_Type_BLUFOR);
374+
};
375+
case east: {
376+
_SRType = ["NONE","ACRE_PRC343","ACRE_SEM52SL"] select GVAR(SR_Type_OPFOR);
377+
_LRType = ["NONE","ACRE_PRC343","ACRE_PRC148","ACRE_PRC152"] select GVAR(LR_Type_OPFOR);
378+
_PKType = ["NONE","ACRE_PRC117F","ACRE_PRC77","ACRE_SEM70"] select GVAR(PK_Type_OPFOR);
379+
};
380+
case independent: {
381+
_SRType = ["NONE","ACRE_PRC343","ACRE_SEM52SL"] select GVAR(SR_Type_Indfor);
382+
_LRType = ["NONE","ACRE_PRC343","ACRE_PRC148","ACRE_PRC152"] select GVAR(LR_Type_Indfor);
383+
_PKType = ["NONE","ACRE_PRC117F","ACRE_PRC77","ACRE_SEM70"] select GVAR(PK_Type_Indfor);
384+
};
385+
case civilian: {
386+
_SRType = ["NONE","ACRE_PRC343","ACRE_SEM52SL"] select GVAR(SR_Type_Civ);
387+
_LRType = ["NONE","ACRE_PRC343","ACRE_PRC148","ACRE_PRC152"] select GVAR(LR_Type_Civ);
388+
_PKType = ["NONE","ACRE_PRC117F","ACRE_PRC77","ACRE_SEM70"] select GVAR(PK_Type_Civ);
389+
};
390+
default {};
391+
};
392+
if (GETPLVAR(UnitSettings_Enable,false)) then {
393+
private _radioIDs = [] call acre_api_fnc_getCurrentRadioList;
394+
TRACE_1("Found Radios",_radiosIDs);
392395

393-
{
394-
private _radioID = [_x] call acre_api_fnc_getRadioByType;
395-
if (!isNil "_radioID") then {
396-
private _result = (GETPLVAR(PK_RADIO_CHANNEL,1));
397-
if (_result < 1) then {
398-
ERROR_1("%1 is not a valid Channel Number",_result);
399-
} else {
400-
if !(_x isEqualTo "ACRE_PRC77") then {
401-
[_radioID, _result] call acre_api_fnc_setRadioChannel;
396+
if (_SRType != "NONE") then {
397+
398+
{
399+
private _radioId = _x;
400+
if(([_radioId, _SRType] call acre_api_fnc_isKindOf)) exitWith {
401+
private _result = (GETPLVAR(SR_RADIO_CHANNEL,1));
402+
if (_result < 1) then {
403+
ERROR_1("%1 is not a valid Channel Number",_result);
404+
} else {
405+
406+
[_radioId, _result] call acre_api_fnc_setRadioChannel;
407+
LOG_2("Setting SR %1 to channel %2",_radioId,_result);
402408
};
403-
};
404-
[_radioID, (["LEFT","CENTER", "RIGHT"] select (GETPLVAR(PK_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
405-
};
406-
} forEach ["ACRE_PRC117F", "ACRE_PRC77", "ACRE_SEM70"];
409+
[_radioId, (["LEFT","CENTER", "RIGHT"] select (GETPLVAR(SR_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
410+
_radioIDs deleteAt _forEachIndex;
411+
};
412+
}forEach _radioIDs;
413+
};
414+
415+
if(_LRType != "NONE") then {
416+
{
417+
private _radioId = _x;
418+
if(([_radioId, _LRType] call acre_api_fnc_isKindOf)) exitWith {
419+
private _result = (GETPLVAR(LR_RADIO_CHANNEL,1));
420+
if (_result < 1) then {
421+
ERROR_1("%1 is not a valid Channel Number",_result);
422+
} else {
423+
424+
[_radioId, _result] call acre_api_fnc_setRadioChannel;
425+
LOG_2("Setting LR %1 to channel %2",_radioId,_result);
426+
};
427+
[_radioId, (["LEFT","CENTER", "RIGHT"] select (GETPLVAR(LR_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
428+
_radioIDs deleteAt _forEachIndex;
429+
};
430+
}forEach _radioIDs;
431+
};
432+
433+
if(_PKType != "NONE") then {
434+
{
435+
private _radioId = _x;
436+
if(([_radioId, _PKType] call acre_api_fnc_isKindOf)) exitWith {
437+
private _result = (GETPLVAR(PK_RADIO_CHANNEL,1));
438+
if (_result < 1) then {
439+
ERROR_1("%1 is not a valid Channel Number",_result);
440+
} else {
441+
442+
[_radioId, _result] call acre_api_fnc_setRadioChannel;
443+
LOG_2("Setting PK %1 to channel %2",_radioId,_result);
444+
};
445+
[_radioId, (["LEFT","CENTER", "RIGHT"] select (GETPLVAR(PK_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
446+
_radioIDs deleteAt _forEachIndex;
447+
};
448+
}forEach _radioIDs;
449+
};
450+
407451
};
408452
}] call CBA_fnc_waitUntilAndExecute;
409453
}] call CBA_fnc_addEventHandler;

‎uo_sys_framework/ACREModule/cfgXEH/init/ServerPreInit.sqf

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/* Description: Sets ACRE Presets and ACRE unit settings
2+
* Arguments:
3+
* N/A
4+
* Return Value:
5+
* ARRAY
6+
* Author
7+
* PiZZADOX & Sacher
8+
*/
9+
10+
#define COMPONENT ACRE
11+
#include "\x\UO_FW\addons\Main\script_macros.hpp"
12+
EXEC_CHECK(SERVER);
13+
if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
14+
15+
[QEGVAR(Core,SettingsLoaded), {
16+
if(GETMVAR(SCRAMBLE_Enabled,false)) then
17+
{
18+
{
19+
private _vehicle = _x;
20+
if(GETVAR(_vehicle,VehicleACRE_Enabled,false)) then {
21+
22+
private _preset = ["default2", "default3", "default4", "default"];
23+
private _names = ["Default","Blufor","Opfor","Indfor","Civilian"];
24+
private _var = GETVAR(_vehicle,VehicleACREPreset,"Default");
25+
private _index = _names find _var;
26+
//ignore if Default or not found
27+
if(_index > 0) then {
28+
private _selectedPresetIndex = _index - 1;
29+
private _selectedPreset = _preset select _selectedPresetIndex;
30+
LOG_2("Setting vehicle %1 to preset %2",_vehicle,_selectedPreset);
31+
[_vehicle, _selectedPreset] call acre_api_fnc_setVehicleRacksPreset;
32+
33+
};
34+
35+
};
36+
37+
38+
}forEach vehicles;
39+
};
40+
41+
}] call CBA_fnc_addEventHandler;

‎uo_sys_framework/AIDriversModule/cfgFunctions/EH/fn_InitPost.sqf

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
11
#define COMPONENT AIDrivers
22
#include "\x\UO_FW\addons\Main\script_macros.hpp"
3-
EXEC_CHECK(ALL);
3+
EXEC_CHECK(SERVER);
44
if !(UO_FW_Server_AIDRIVERSMODULE_Allowed) exitwith {};
55

66
params ["_vehicle"];
77

88
//IGNORE_PRIVATE_WARNING ["_thisArgs"];
9-
10-
[QEGVAR(Core,SettingsLoaded), {
11-
private _vehicle = _thisArgs;
9+
[{(CBA_missionTime > 0)},{
10+
params ["_vehicle"];
1211
private _allowNV = GETMVAR(NVEnabled,false);
13-
private _allowFlip = GETMVAR(FlipEnabled,false);
14-
if (GETMVAR(AllVehs,false)) exitwith {
12+
private _allowFlip = GETMVAR(FlipEnabled,false);
13+
private _allVeh = GETMVAR(AllVehs,false);
14+
private _inClasses = (typeOf _vehicle) in (GETMVAR(VehClasses,[]));
15+
private _option = GETVAR(_vehicle,VehEnabled,false);
16+
17+
LOG_4("Trying to add AI Drivers to %1 _allVehicles=%2 _inClasses=%3 _option=%4", _vehicle,_allVeh,_inClasses,_option);
18+
19+
if (_allVeh) exitwith {
1520
[QGVAR(Enabled_Event),[_vehicle,_allowNV,_allowFlip]] call CBA_fnc_globalEventJIP;
1621
[QEGVAR(Core,RegisterModuleEvent), ["AI Drivers", "Module for adding AI Drivers to vehicles", "BlackHawk, PiZZADOX and Sacher"]] call CBA_fnc_globalEventJIP;
1722
};
18-
if ((typeOf _vehicle) in (GETMVAR(VehClasses,[]))) exitwith {
23+
if (_inClasses) exitwith {
1924
[QEGVAR(Core,RegisterModuleEvent), ["AI Drivers", "Module for adding AI Drivers to vehicles", "BlackHawk, PiZZADOX and Sacher"]] call CBA_fnc_globalEventJIP;
2025
[QGVAR(Enabled_Event),[_vehicle,_allowNV,_allowFlip]] call CBA_fnc_globalEventJIP;
2126
};
22-
if (GETVAR(_vehicle,VehEnabled,false)) then {
27+
if (_option) then {
2328
private _allowNV = GETVAR(_vehicle,VehNVEnabled,false);
24-
private _allowFlip = GETVAR(_vehicle,VehFlipEnabled,false);
29+
private _allowFlip = GETVAR(_vehicle,VehFlipEnabled,false);
2530
[QGVAR(Enabled_Event),[_vehicle,_allowNV,_allowFlip]] call CBA_fnc_globalEventJIP;
2631
[QEGVAR(Core,RegisterModuleEvent), ["AI Drivers", "Module for adding AI Drivers to vehicles", "BlackHawk, PiZZADOX and Sacher"]] call CBA_fnc_globalEventJIP;
2732
};
28-
}, _vehicle] call CBA_fnc_addEventHandlerArgs;
33+
34+
}, _vehicle] call CBA_fnc_WaitUntilAndExecute;

‎uo_sys_framework/AIDriversModule/cfgFunctions/common/fn_EnableAIDriver.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ if (_enableNV) then {
7575
[_veh, 1, ["ACE_SelfActions"], _pipNvAction] call ace_interact_menu_fnc_addActionToObject;
7676
};
7777

78-
SETPVAR(_veh,hasActions,true);
78+
SETVAR(_veh,hasActions,true);

‎uo_sys_framework/AIDriversModule/cfgXEH/init/ClientPreInit.sqf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ EXEC_CHECK(CLIENT);
1414

1515
[QGVAR(Enabled_Event), {
1616
params ["_vehicle","_allowNV","_allowFlip"];
17+
LOG_1("Enabling AI Driver for %1",_vehicle);
1718
[_vehicle,_allowNV,_allowFlip] call FUNC(EnableAIDriver);
1819
}] call CBA_fnc_addEventHandler;

‎uo_sys_framework/AOLimitModule/cfgFunctions/common/fn_Init.sqf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ EXEC_CHECK(CLIENT);
7777
_argNested params ["_unit","_args","_startedInside","_outSide","_enteredZone","_arrayname","_softAOMode","_recheckDead","_pos"];
7878
_args params ["","_area","","_entryMode","_airsetting","","_softAOtime","_softAOtimeAir"];
7979

80-
LOG_1("_argNested: %1",_argNested);
81-
LOG_1("_area: %1",_area);
82-
LOG_1("(vehicle _unit): %1",(vehicle _unit));
80+
//LOG_1("_argNested: %1",_argNested);
81+
//LOG_1("_area: %1",_area);
82+
//LOG_1("(vehicle _unit): %1",(vehicle _unit));
8383
private _air = ((vehicle _unit) isKindOf "Air");
8484
if ((_airsetting) && {_air}) exitwith {};
8585

8686
if ((count ((missionNamespace getvariable _arrayname))) isEqualto 1) then {
8787
if ((vehicle _unit) inArea _area) then {
88-
LOG("unit in area");
88+
// LOG("unit in area");
8989
_outSide = false;
9090
_argNested set [3,_outSide];
9191
_enteredZone = true;
@@ -117,7 +117,7 @@ EXEC_CHECK(CLIENT);
117117
};
118118
} else {
119119
if (({(vehicle _unit) inArea _x} count (missionNamespace getvariable _arrayname)) > 0) then {
120-
LOG("unit in area b");
120+
//LOG("unit in area b");
121121
_enteredZone = true;
122122
_argNested set [4,_enteredZone];
123123
_outSide = false;
@@ -150,7 +150,7 @@ EXEC_CHECK(CLIENT);
150150
};
151151

152152
SETMVAR(Display,_outSide);
153-
LOG_1("_outSide: %1",_outSide);
153+
//LOG_1("_outSide: %1",_outSide);
154154

155155
if ((count (missionNamespace getvariable _arrayname)) == 1) then {
156156
if ((!(_startedInside) && {!_softAOMode} && {(_entryMode)} && {!((vehicle _unit) inArea _area)}) || {(_recheckDead && !_softAOMode)}) then {

0 commit comments

Comments
 (0)