Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some nil functions

Browse Source
This commit is contained in:
PabstMirror 2015-09-18 13:47:19 -05:00
parent a53d158a89
commit c62ea5e406
8 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/captives/XEH_postInit.sqf
View File

@ -18,7 +18,6 @@ if (isServer) then {
}]; }];
}; };
["playerVehicleChanged", {_this call FUNC(handleVehicleChanged)}] call EFUNC(common,addEventHandler);
["zeusDisplayChanged", {_this call FUNC(handleZeusDisplayChanged)}] call EFUNC(common,addEventHandler); ["zeusDisplayChanged", {_this call FUNC(handleZeusDisplayChanged)}] call EFUNC(common,addEventHandler);
["playerChanged", {_this call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler); ["playerChanged", {_this call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);
["MoveInCaptive", {_this call FUNC(vehicleCaptiveMoveIn)}] call EFUNC(common,addEventHandler); ["MoveInCaptive", {_this call FUNC(vehicleCaptiveMoveIn)}] call EFUNC(common,addEventHandler);

2
addons/captives/functions/fnc_handleGetIn.sqf
View File

@ -26,7 +26,7 @@ if (local _unit) then {
}; };
if (_unit getVariable [QGVAR(isSurrendering), false]) then { if (_unit getVariable [QGVAR(isSurrendering), false]) then {
[_unit, false] call FUNC(setSurrender); [_unit, false] call FUNC(setSurrendered);
}; };
if (_unit getVariable [QGVAR(isHandcuffed), false]) then { if (_unit getVariable [QGVAR(isHandcuffed), false]) then {

2
addons/common/functions/fnc_resetAllDefaults.sqf
View File

@ -18,7 +18,7 @@ _unit setvariable ["ACE_isUnconscious", nil, true];
if (isPlayer _unit) then { if (isPlayer _unit) then {
[true] call FUNC(setVolume); [true] call FUNC(setVolume);
[false] call FUNC(disableKeyInput); [false] call FUNC(disableKeyInput);
if (["ace_medical"] call FUNC(isModLoader)) then { if (["ace_medical"] call FUNC(isModLoaded)) then {
[false] call EFUNC(medical,effectBlackOut); [false] call EFUNC(medical,effectBlackOut);
}; };

2
addons/medical/functions/fnc_addToTriageCard.sqf
View File

@ -18,7 +18,7 @@ private ["_log", "_inList", "_amount"];
params ["_unit", "_newItem"]; params ["_unit", "_newItem"];
if (!local _unit) exitwith { if (!local _unit) exitwith {
[_this, QUOTE(DFUNC(addToTriageList)), _unit] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ [_this, QUOTE(DFUNC(addToTriageCard)), _unit] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
}; };
_log = _unit getvariable [QGVAR(triageCard), []]; _log = _unit getvariable [QGVAR(triageCard), []];

2
addons/medical/functions/fnc_handleDamage.sqf
View File

@ -109,7 +109,7 @@ if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitW
if (_delayedUnconsicous) then { if (_delayedUnconsicous) then {
[{ [{
[_this select 0, true] call FUNC(setUnconscious); [_this select 0, true] call FUNC(setUnconscious);
}, [_unit], 0.7, 0] call EFUNC(common,waitAndExec); }, [_unit], 0.7, 0] call EFUNC(common,waitAndExecute);
} else { } else {
[{ [{
[_this select 0, true] call FUNC(setUnconscious); [_this select 0, true] call FUNC(setUnconscious);

2
addons/medical_menu/functions/fnc_onMenuOpen.sqf
View File

@ -74,7 +74,7 @@ GVAR(MenuPFHID) = [{
[GVAR(INTERACTION_TARGET)] call FUNC(updateIcons); [GVAR(INTERACTION_TARGET)] call FUNC(updateIcons);
[GVAR(LatestDisplayOptionMenu)] call FUNC(handleUI_DisplayOptions); [GVAR(LatestDisplayOptionMenu)] call FUNC(handleUI_DisplayOptions);
_status = [GVAR(INTERACTION_TARGET)] call FUNC(getTriageStatus); _status = [GVAR(INTERACTION_TARGET)] call EFUNC(medical,getTriageStatus);
(_display displayCtrl 2000) ctrlSetText (_status select 0); (_display displayCtrl 2000) ctrlSetText (_status select 0);
(_display displayCtrl 2000) ctrlSetBackgroundColor (_status select 2); (_display displayCtrl 2000) ctrlSetBackgroundColor (_status select 2);

2
addons/mk6mortar/functions/fnc_dev_simulateFindSolution.sqf
View File

@ -13,7 +13,7 @@
* ARRAY - [NUMBER - Elevation In Degrees, NUMBER - Shot Durration] * ARRAY - [NUMBER - Elevation In Degrees, NUMBER - Shot Durration]
* *
* Example: * Example:
* [_rangeToHit, _heightToHit, _muzzleVelocity, _airFriction, TIME_STEP] call FUNC(simulateFindSolution); * [_rangeToHit, _heightToHit, _muzzleVelocity, _airFriction, TIME_STEP] call ace_mk6mortar_fnc_dev_simulateFindSolution;
* *
* Public: No * Public: No
*/ */

2
addons/scopes/XEH_postInit.sqf
View File

@ -161,5 +161,3 @@ GVAR(showShortdot) = false;
}; };
}; };
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
addMissionEventHandler ["Draw3D", {if (GVAR(showShortdot)) then {call FUNC(onDrawShortdot)};}];