From ca17e7120080e8ea5433bfb50a84c32d4e8c22b4 Mon Sep 17 00:00:00 2001 From: SAM Date: Fri, 15 May 2015 10:06:11 +0200 Subject: [PATCH] Safemode macro cleanup --- addons/safemode/functions/fnc_firstMode.sqf | 2 +- addons/safemode/functions/fnc_lockSafety.sqf | 2 +- addons/safemode/functions/fnc_playChangeFiremodeSound.sqf | 2 +- addons/safemode/functions/fnc_setSafeModeVisual.sqf | 2 +- addons/safemode/functions/fnc_unlockSafety.sqf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/safemode/functions/fnc_firstMode.sqf b/addons/safemode/functions/fnc_firstMode.sqf index 821090dd32..d10da3f896 100644 --- a/addons/safemode/functions/fnc_firstMode.sqf +++ b/addons/safemode/functions/fnc_firstMode.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_1_PVT(_this,_weapon); +PARAMS_1(_weapon); private ["_mode"]; _mode = getArray (configFile >> "CfgWeapons" >> _weapon >> "modes") select 0; diff --git a/addons/safemode/functions/fnc_lockSafety.sqf b/addons/safemode/functions/fnc_lockSafety.sqf index 0e365fc221..7df83fe39d 100644 --- a/addons/safemode/functions/fnc_lockSafety.sqf +++ b/addons/safemode/functions/fnc_lockSafety.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_3_PVT(_this,_unit,_weapon,_muzzle); +PARAMS_3(_unit,_weapon,_muzzle); // don't immediately switch back if (inputAction "nextWeapon" > 0) exitWith {}; diff --git a/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf b/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf index 6c2c797706..f7ef6bcbd3 100644 --- a/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf +++ b/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_2_PVT(_this,_unit,_weapon); +PARAMS_2(_unit,_weapon); private ["_sound"]; _sound = getArray (configFile >> "CfgWeapons" >> _weapon >> "changeFiremodeSound"); diff --git a/addons/safemode/functions/fnc_setSafeModeVisual.sqf b/addons/safemode/functions/fnc_setSafeModeVisual.sqf index ae449e05e8..52f5fab98f 100644 --- a/addons/safemode/functions/fnc_setSafeModeVisual.sqf +++ b/addons/safemode/functions/fnc_setSafeModeVisual.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_1_PVT(_this,_show); +PARAMS_1(_show); disableSerialization; diff --git a/addons/safemode/functions/fnc_unlockSafety.sqf b/addons/safemode/functions/fnc_unlockSafety.sqf index 341cad182f..58e7f5bad3 100644 --- a/addons/safemode/functions/fnc_unlockSafety.sqf +++ b/addons/safemode/functions/fnc_unlockSafety.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_3_PVT(_this,_unit,_weapon,_muzzle); +PARAMS_3(_unit,_weapon,_muzzle); private ["_safedWeapons"]; _safedWeapons = _unit getVariable [QGVAR(safedWeapons), []];