From 7c099c10099ebd4f38074185186f086de9b55c25 Mon Sep 17 00:00:00 2001
From: SAM <simon@agius-muscat.net>
Date: Fri, 15 May 2015 09:59:57 +0200
Subject: [PATCH] Weaponselect module macro cleanup

---
 .../functions/fnc_displayGrenadeTypeAndNumber.sqf           | 5 +----
 .../weaponselect/functions/fnc_findNextGrenadeMagazine.sqf  | 2 +-
 addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf | 4 ++--
 addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf     | 4 ++--
 .../weaponselect/functions/fnc_playChangeFiremodeSound.sqf  | 5 ++---
 addons/weaponselect/functions/fnc_putWeaponAway.sqf         | 4 +---
 addons/weaponselect/functions/fnc_selectWeaponMode.sqf      | 6 +-----
 addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf    | 6 +-----
 addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf   | 6 +-----
 addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf  | 5 +----
 addons/weaponselect/functions/fnc_throwGrenade.sqf          | 6 +++---
 11 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf b/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf
index d7a68e7f50..81cb57d9f3 100644
--- a/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf
+++ b/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf
@@ -12,12 +12,9 @@
  */
 #include "script_component.hpp"
 
-private ["_magazine", "_numberofMagazines"];
-
 if !(GVAR(DisplayText)) exitwith {};
 
-_magazine = _this select 0;
-_numberofMagazines = _this select 1;
+PARAMS_2(_magazine,_numberofMagazines);
 
 private ["_color", "_name", "_text", "_picture"];
 
diff --git a/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf b/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf
index 02a13ec932..411df5fe6c 100644
--- a/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf
+++ b/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf
@@ -3,7 +3,7 @@
 
 private ["_type", "_allMags", "_allMuzzles", "_magazines"];
 
-_type = _this select 0; //"All", "Frag" or "NonFrag"
+PARAMS_1(_type); //"All", "Frag" or "NonFrag"
 
 _allMags = missionNamespace getVariable [format [QGVAR(%1Magazines), _type], []];
 _allMuzzles = missionNamespace getVariable [format [QGVAR(%1Muzzles), _type], []];
diff --git a/addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf b/addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf
index 76b4efd894..0491afa413 100644
--- a/addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf
+++ b/addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf
@@ -1,9 +1,9 @@
 // by commy2
 #include "script_component.hpp"
 
-private ["_type", "_allMags", "_allMuzzles", "_magazines"];
+private ["_allMags", "_allMuzzles", "_magazines"];
 
-_type = _this select 0; //"All", "Frag" or "NonFrag"
+PARAMS_1(_type); //"All", "Frag" or "NonFrag"
 
 _allMags = missionNamespace getVariable [format [QGVAR(%1Magazines), _type], []];
 _allMuzzles = missionNamespace getVariable [format [QGVAR(%1Muzzles), _type], []];
diff --git a/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf b/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf
index 6b58fc7bc5..37e2b1c873 100644
--- a/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf
+++ b/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf
@@ -1,9 +1,9 @@
 // by commy2
 #include "script_component.hpp"
 
-private ["_vehicle", "_turret", "_weapons"];
+private ["_turret", "_weapons"];
 
-_vehicle = _this select 0;
+PARAMS_1(_vehicle);
 
 _turret = [_vehicle] call EFUNC(common,getTurretCommander);
 
diff --git a/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf b/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf
index ea671a530d..45e84d631d 100644
--- a/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf
+++ b/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf
@@ -1,10 +1,9 @@
 // by commy2
 #include "script_component.hpp"
 
-private ["_unit", "_weapon", "_sound"];
+private ["_sound"];
 
-_unit = _this select 0;
-_weapon = _this select 1;
+PARAMS_2(_unit,_weapon);
 
 _sound = getArray (configFile >> "CfgWeapons" >> _weapon >> "changeFiremodeSound");
 
diff --git a/addons/weaponselect/functions/fnc_putWeaponAway.sqf b/addons/weaponselect/functions/fnc_putWeaponAway.sqf
index 7c0bc47cd7..a4cd743bfb 100644
--- a/addons/weaponselect/functions/fnc_putWeaponAway.sqf
+++ b/addons/weaponselect/functions/fnc_putWeaponAway.sqf
@@ -11,9 +11,7 @@
  */
 #include "script_component.hpp"
 
-private "_unit";
-
-_unit = _this select 0;
+PARAMS_1(_unit);
 
 [_unit] call EFUNC(common,fixLoweredRifleAnimation);
 
diff --git a/addons/weaponselect/functions/fnc_selectWeaponMode.sqf b/addons/weaponselect/functions/fnc_selectWeaponMode.sqf
index aea777d709..012bf94898 100644
--- a/addons/weaponselect/functions/fnc_selectWeaponMode.sqf
+++ b/addons/weaponselect/functions/fnc_selectWeaponMode.sqf
@@ -11,10 +11,7 @@
  */
 #include "script_component.hpp"
 
-private ["_unit", "_weapon"];
-
-_unit = _this select 0;
-_weapon = _this select 1;
+PARAMS_2(_unit,_weapon);
 
 if (_weapon == "") exitWith {};
 
@@ -32,7 +29,6 @@ private ["_muzzles", "_modes"];
 _muzzles = [_weapon] call EFUNC(common,getWeaponMuzzles);
 _modes = [_weapon] call EFUNC(common,getWeaponModes);
 
-
 private ["_index", "_muzzle", "_mode"];
 
 _index = (_modes find currentWeaponMode _unit) + 1;
diff --git a/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf b/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf
index 011108e448..67e63cd830 100644
--- a/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf
+++ b/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf
@@ -11,10 +11,7 @@
  */
 #include "script_component.hpp"
 
-private ["_unit", "_weapon"];
-
-_unit = _this select 0;
-_weapon = _this select 1;
+PARAMS_2(_unit,_weapon);
 
 if (_weapon == "") exitWith {};
 
@@ -40,7 +37,6 @@ if (_index > count _muzzles - 1) then {_index = 1};
 
 _muzzle = _muzzles select _index;
 
-
 _index = 0;
 while {
     _index < 100 && {currentMuzzle _unit != _muzzle}
diff --git a/addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf b/addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf
index 929537b7fa..9507c23a30 100644
--- a/addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf
+++ b/addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf
@@ -1,11 +1,7 @@
 // by commy2
 #include "script_component.hpp"
 
-private ["_unit", "_vehicle", "_index"];
-
-_unit = _this select 0;
-_vehicle = _this select 1;
-_index = _this select 2;
+PARAMS_3(_unit,_vehicle,_index);
 
 private "_turret";
 _turret = [_unit] call EFUNC(common,getTurretIndex);
diff --git a/addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf b/addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf
index 81d1a59ed1..4bf970fab1 100644
--- a/addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf
+++ b/addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf
@@ -12,10 +12,7 @@
  */
 #include "script_component.hpp"
 
-private ["_unit", "_muzzle"];
-
-_unit = _this select 0;
-_muzzle = _this select 1;
+PARAMS_2(_unit,_muzzle);
 
 private ["_uniformMags", "_vestMags", "_backpackMags", "_i", "_uniformMagsToRemove", "_vestMagsToRemove", "_backpackMagsToRemove", "_firstMagazine", "_throwMuzzleNames"];
 
diff --git a/addons/weaponselect/functions/fnc_throwGrenade.sqf b/addons/weaponselect/functions/fnc_throwGrenade.sqf
index e62e118e71..cb7769df90 100644
--- a/addons/weaponselect/functions/fnc_throwGrenade.sqf
+++ b/addons/weaponselect/functions/fnc_throwGrenade.sqf
@@ -1,10 +1,10 @@
 // by commy2
 #include "script_component.hpp"
 
-private ["_unit", "_weapon", "_magazine"];
+private ["_magazine"];
+
+PARAMS_2(_unit,_weapon);
 
-_unit = _this select 0;
-_weapon = _this select 1;
 _magazine = _this select 5;
 
 if (_weapon != "Throw") exitWith {};