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

Handle changes to CBA_fnc_addPlayerEventHandler (#4878)

Browse Source 
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
This commit is contained in:
PabstMirror 2017-02-10 13:03:12 -06:00 committed by GitHub
parent 78a55d4436
commit 159e762576
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/advanced_fatigue/XEH_postInit.sqf
View File

@ -14,12 +14,15 @@ if (!hasInterface) exitWith {};
// - GVAR updating and initialization ----------------------------------------- // - GVAR updating and initialization -----------------------------------------
["unit", FUNC(handlePlayerChanged), true] call CBA_fnc_addPlayerEventHandler; ["unit", FUNC(handlePlayerChanged), true] call CBA_fnc_addPlayerEventHandler;
private _fnc_showStaminaBar = { ["visibleMap", {
params ["", "_visibleMap"]; // command visibleMap is updated one frame later
private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
_staminaBarContainer ctrlShow ((!_visibleMap) && {(vehicle ACE_player) == ACE_player});
}, true] call CBA_fnc_addPlayerEventHandler;
["vehicle", {
private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull]; private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
_staminaBarContainer ctrlShow ((!visibleMap) && {(vehicle ACE_player) == ACE_player}); _staminaBarContainer ctrlShow ((!visibleMap) && {(vehicle ACE_player) == ACE_player});
}; }, true] call CBA_fnc_addPlayerEventHandler;
["visibleMap", _fnc_showStaminaBar, true] call CBA_fnc_addPlayerEventHandler;
["vehicle", _fnc_showStaminaBar, true] call CBA_fnc_addPlayerEventHandler;
// - Duty factors ------------------------------------------------------------- // - Duty factors -------------------------------------------------------------
if (["ACE_Medical"] call EFUNC(common,isModLoaded)) then { if (["ACE_Medical"] call EFUNC(common,isModLoaded)) then {

3
addons/advanced_throwing/XEH_postInit.sqf
View File

@ -67,7 +67,8 @@ GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;
}] call CBA_fnc_addPlayerEventhandler; }] call CBA_fnc_addPlayerEventhandler;
["visibleMap", { ["visibleMap", {
if (visibleMap && {ACE_player getVariable [QGVAR(inHand), false]}) then { params ["", "_visibleMap"]; // command visibleMap is updated one frame later
if (_visibleMap && {ACE_player getVariable [QGVAR(inHand), false]}) then {
[ACE_player, "Opened Map"] call FUNC(exitThrowMode); [ACE_player, "Opened Map"] call FUNC(exitThrowMode);
}; };
}] call CBA_fnc_addPlayerEventhandler; }] call CBA_fnc_addPlayerEventhandler;

4
addons/common/XEH_postInit.sqf
View File

@ -282,11 +282,11 @@ enableCamShake true;
params ["_newPlayer","_oldPlayer"]; params ["_newPlayer","_oldPlayer"];
if (alive _newPlayer) then { if (alive _newPlayer) then {
[_newPlayer] call FUNC(setName); [FUNC(setName), [_newPlayer]] call CBA_fnc_execNextFrame;
}; };
if (alive _oldPlayer) then { if (alive _oldPlayer) then {
[_oldPlayer] call FUNC(setName); [FUNC(setName), [_oldPlayer]] call CBA_fnc_execNextFrame;
}; };
}] call CBA_fnc_addPlayerEventHandler; }] call CBA_fnc_addPlayerEventHandler;

1
addons/common/functions/fnc_setName.sqf
View File

@ -13,6 +13,7 @@
#include "script_component.hpp" #include "script_component.hpp"
params ["_unit"]; params ["_unit"];
TRACE_3("setName",_unit,alive _unit,name _unit);
if (isNull _unit || {!alive _unit}) exitWith {}; if (isNull _unit || {!alive _unit}) exitWith {};