mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Revert postInit.
This commit is contained in:
parent
5a29c4b04c
commit
1ffd9d58ab
@ -73,7 +73,7 @@ call FUNC(determineZoom);
|
|||||||
[_this select 1] call CBA_fnc_removePerFrameHandler;
|
[_this select 1] call CBA_fnc_removePerFrameHandler;
|
||||||
}, 0] call CBA_fnc_addPerFrameHandler;
|
}, 0] call CBA_fnc_addPerFrameHandler;
|
||||||
|
|
||||||
["SettingsInitialized", {
|
["ace_settingsInitialized", {
|
||||||
if (isMultiplayer && {GVAR(DefaultChannel) != -1}) then {
|
if (isMultiplayer && {GVAR(DefaultChannel) != -1}) then {
|
||||||
//Set the chat channel once the map has finished loading
|
//Set the chat channel once the map has finished loading
|
||||||
[{
|
[{
|
||||||
@ -100,15 +100,15 @@ call FUNC(determineZoom);
|
|||||||
GVAR(flashlightInUse) = "";
|
GVAR(flashlightInUse) = "";
|
||||||
GVAR(glow) = objNull;
|
GVAR(glow) = objNull;
|
||||||
|
|
||||||
["playerInventoryChanged", {
|
["ace_playerInventoryChanged", {
|
||||||
private _flashlights = [ACE_player] call FUNC(getUnitFlashlights);
|
private _flashlights = [ACE_player] call FUNC(getUnitFlashlights);
|
||||||
if ((GVAR(flashlightInUse) != "") && !(GVAR(flashlightInUse) in _flashlights)) then {
|
if ((GVAR(flashlightInUse) != "") && !(GVAR(flashlightInUse) in _flashlights)) then {
|
||||||
GVAR(flashlightInUse) = "";
|
GVAR(flashlightInUse) = "";
|
||||||
};
|
};
|
||||||
}] call EFUNC(common,addEventHandler);
|
}] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
if (GVAR(mapGlow)) then {
|
if (GVAR(mapGlow)) then {
|
||||||
["visibleMapChanged", {
|
["ace_visibleMapChanged", {
|
||||||
params ["_player", "_mapOn"];
|
params ["_player", "_mapOn"];
|
||||||
if (_mapOn) then {
|
if (_mapOn) then {
|
||||||
if (!alive _player && !isNull GVAR(glow)) then {
|
if (!alive _player && !isNull GVAR(glow)) then {
|
||||||
@ -128,15 +128,15 @@ call FUNC(determineZoom);
|
|||||||
[""] call FUNC(flashlightGlow);
|
[""] call FUNC(flashlightGlow);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}] call EFUNC(common,addEventHandler);
|
}] call CBA_fnc_addEventHandler;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}] call EFUNC(common,addEventHandler);
|
}] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
// hide clock on map if player has no watch
|
// hide clock on map if player has no watch
|
||||||
GVAR(hasWatch) = true;
|
GVAR(hasWatch) = true;
|
||||||
|
|
||||||
["playerInventoryChanged", {
|
["ace_playerInventoryChanged", {
|
||||||
if (isNull (_this select 0)) exitWith {
|
if (isNull (_this select 0)) exitWith {
|
||||||
GVAR(hasWatch) = true;
|
GVAR(hasWatch) = true;
|
||||||
};
|
};
|
||||||
@ -145,4 +145,4 @@ GVAR(hasWatch) = true;
|
|||||||
if (_x isKindOf ["ItemWatch", configFile >> "CfgWeapons"]) exitWith {GVAR(hasWatch) = true;};
|
if (_x isKindOf ["ItemWatch", configFile >> "CfgWeapons"]) exitWith {GVAR(hasWatch) = true;};
|
||||||
false
|
false
|
||||||
} count (assignedItems ACE_player);
|
} count (assignedItems ACE_player);
|
||||||
}] call EFUNC(common,addEventHandler);
|
}] call CBA_fnc_addEventHandler;
|
||||||
|
Loading…
Reference in New Issue
Block a user