Rename and adjustments

acemod · Jul 15, 2019 · 993423e · 993423e
1 parent 9feefa4
commit 993423e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/addons/safemode/XEH_PREP.hpp b/addons/safemode/XEH_PREP.hpp
@@ -3,4 +3,4 @@ PREP(lockSafety);
 PREP(playChangeFiremodeSound);
 PREP(setSafeModeVisual);
 PREP(unlockSafety);
-PREP(safeWeapon);
+PREP(setWeaponSafety);
diff --git a/addons/safemode/functions/fn_safeWeapon.sqf → ...safemode/functions/fn_setWeaponSafety.sqf b/addons/safemode/functions/fn_safeWeapon.sqf → ...safemode/functions/fn_setWeaponSafety.sqf
@@ -4,30 +4,30 @@
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Weapon <STRING>
- * 2: Muzzle <STRING>
  * 3: State <BOOL>
  *
  * Return Value:
  * None
  *
  * Example:
- * [ACE_player, currentWeapon ACE_player, currentMuzzle Ace_player, true] call ace_safemode_fnc_safeWeapon
+ * [ACE_player, true] call ace_safemode_fnc_safeWeapon
  *
  * Public: yes
  */
 
 params [
     ["_unit", objNull, [objNull]], 
-    ["_weapon", "", [""]],
-    ["_muzzle", "", [""]],
     ["_state", true, [true]]
 ];
 
 private _safedWeapons = _unit getVariable [QGVAR(safedWeapons), []];
 
+private _weapon = currentWeapon _unit;
 _weapon = configName (configFile >> "CfgWeapons" >> _weapon);
 
+private _muzzle = currentMuzzle _unit;
+_muzzle = configName (configFile >> "CfgWeapons" >> _muzzle);
+
 if !(_state isEqualTo (_weapon in _safedWeapons)) then {
     [_unit, _weapon, _muzzle] call FUNC(lockSafety);
 };