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

Safe Mode - Fix disabled laser on safety switch (#6639)

Browse Source 
* Fix disabled laser on safety switch

* Add workaround for switching to primary weapon

* Add UGL check
This commit is contained in:
Dystopian 2019-03-12 20:26:20 +04:00 committed by PabstMirror
parent 842f9e5d3b
commit 2ff614c3a2
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/safemode/functions/fnc_lockSafety.sqf
View File

@ -60,7 +60,19 @@ if (_unit getVariable [QGVAR(actionID), -1] == -1) then {
}; };
if (_muzzle isEqualType "") then { if (_muzzle isEqualType "") then {
private _laserEnabled = _unit isIRLaserOn _weapon || {_unit isFlashlightOn _weapon};
_unit selectWeapon _muzzle; _unit selectWeapon _muzzle;
if (
_laserEnabled
&& {
_muzzle == primaryWeapon _unit // prevent UGL switch
|| {"" == primaryWeapon _unit} // Arma switches to primary weapon if exists
}
) then {
{_unit action [_x, _unit]} forEach ["GunLightOn", "IRLaserOn"];
};
}; };
// play fire mode selector sound // play fire mode selector sound

12
addons/safemode/functions/fnc_unlockSafety.sqf
View File

@ -30,8 +30,20 @@ if (_safedWeapons isEqualTo []) then {
_unit setVariable [QGVAR(actionID), -1]; _unit setVariable [QGVAR(actionID), -1];
}; };
private _laserEnabled = _unit isIRLaserOn _weapon || {_unit isFlashlightOn _weapon};
_unit selectWeapon _muzzle; _unit selectWeapon _muzzle;
if (
_laserEnabled
&& {
_muzzle == primaryWeapon _unit // prevent UGL switch
|| {"" == primaryWeapon _unit} // Arma switches to primary weapon if exists
}
) then {
{_unit action [_x, _unit]} forEach ["GunLightOn", "IRLaserOn"];
};
if (inputAction "nextWeapon" > 0) then { if (inputAction "nextWeapon" > 0) then {
// switch to the last mode to roll over to first after the default nextWeapon action // switch to the last mode to roll over to first after the default nextWeapon action
// get weapon modes // get weapon modes