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 merge (was moved to XEH_postInitServer)

Browse Source 
Use short circuit for loadout change and add note
This commit is contained in:
PabstMirror 2016-08-25 18:23:42 -05:00
parent fd6bd7f794
commit c9f9b89ea2
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/map/XEH_postInitClient.sqf
View File

@ -1,23 +1,5 @@
#include "script_component.hpp" #include "script_component.hpp"
//Delete map glow lights from disconnecting players #2810
if (isServer) then {
addMissionEventHandler ["HandleDisconnect",{
params ["_disconnectedPlayer"];
if ((!GVAR(mapGlow)) || {isNull _disconnectedPlayer}) exitWith {};
{
if (_x isKindOf "ACE_FlashlightProxy_White") then {
// ACE_LOGINFO_2("Deleting leftover light [%1:%2] from DC player [%3]", _x, typeOf _x, _disconnectedPlayer);
detach _x;
deleteVehicle _x;
};
} forEach attachedObjects _disconnectedPlayer;
nil
}];
};
// Exit on Headless as well // Exit on Headless as well
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
@ -98,10 +80,10 @@ call FUNC(determineZoom);
if (GVAR(mapIllumination)) then { if (GVAR(mapIllumination)) then {
["loadout", { ["loadout", {
params ["_player", ""]; params ["_player", ""];
private _flashlightItems = [_player] call FUNC(getUnitFlashlights);
private _unitLight = _player getVariable [QGVAR(flashlight), ["", objNull]]; private _unitLight = _player getVariable [QGVAR(flashlight), ["", objNull]];
_unitLight params ["_flashlight", "_glow"]; _unitLight params ["_flashlight", "_glow"];
if (!(_flashlight isEqualTo "") && {!(_flashlight in _flashlightItems)}) then { if ((_flashlight != "") && {!(_flashlight in ([_player] call FUNC(getUnitFlashlights)))}) then {
// remove the current glow if the unit suddenly lost it's flashlight
if (!isNull _glow) then { if (!isNull _glow) then {
_glow = [_player, "", false] call FUNC(flashlightGlow); _glow = [_player, "", false] call FUNC(flashlightGlow);
}; };
@ -110,7 +92,7 @@ call FUNC(determineZoom);
}] call CBA_fnc_addPlayerEventHandler; }] call CBA_fnc_addPlayerEventHandler;
if (GVAR(mapGlow)) then { if (GVAR(mapGlow)) then {
["ace_visibleMapChanged", { ["visibleMap", {
params ["_player", "_mapOn"]; params ["_player", "_mapOn"];
private _unitLight = _player getVariable [QGVAR(flashlight), ["", objNull]]; private _unitLight = _player getVariable [QGVAR(flashlight), ["", objNull]];
_unitLight params ["_flashlight", "_glow"]; _unitLight params ["_flashlight", "_glow"];
@ -125,7 +107,7 @@ call FUNC(determineZoom);
[_player, ""] call FUNC(flashlightGlow); [_player, ""] call FUNC(flashlightGlow);
}; };
}; };
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addPlayerEventHandler;
}; };
}; };
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;

2
addons/map/XEH_postInitServer.sqf
View File

@ -13,4 +13,4 @@ addMissionEventHandler ["HandleDisconnect",{
}; };
nil nil
}]; }];

2
addons/map/config.cpp
View File

@ -165,4 +165,4 @@ class RscDisplayServerGetReady: RscDisplayGetReady {
#include "MapControls.hpp" #include "MapControls.hpp"
}; };
}; };
}; };