server function cleanup (Changing all BIS_fnc_Param with Param/Params)

life_server/Functions/Gangs/fn_queryPlayerGang.sqf

@@ -5,14 +5,12 @@
     Description:
     Queries to see if the player belongs to any gang.
 */
-private ["_query","_queryResult"];
+private _query = format ["SELECT id, owner, name, maxmembers, bank, members FROM gangs WHERE active='1' AND members LIKE '%2%1%2'",_this,"%"];
 
-_query = format ["SELECT id, owner, name, maxmembers, bank, members FROM gangs WHERE active='1' AND members LIKE '%2%1%2'",_this,"%"];
-
-_queryResult = [_query,2] call DB_fnc_asyncCall;
+private _queryResult = [_query,2] call DB_fnc_asyncCall;
 
 if !(count _queryResult isEqualTo 0) then {
-    _tmp = [_queryResult select 5] call DB_fnc_mresToArray;
+    private _tmp = [_queryResult select 5] call DB_fnc_mresToArray;
     if (_tmp isEqualType "") then {_tmp = call compile format ["%1", _tmp];};
     _queryResult set[5, _tmp];
 };

life_server/Functions/Gangs/fn_removeGang.sqf

@@ -6,8 +6,10 @@
     Description:
     Removes gang from database
 */
-private ["_group","_groupID"];
-_group = param [0,grpNull,[grpNull]];
+private ["_groupID","_result"];
+params [
+    ["_group",grpNull,[grpNull]]
+];
 if (isNull _group) exitWith {};
 
 _groupID = _group getVariable ["gang_id",-1];

life_server/Functions/MySQL/fn_asyncCall.sqf

@@ -11,10 +11,12 @@
         1: INTEGER (1 = ASYNC + not return for update/insert, 2 = ASYNC + return for query's).
         3: BOOL (True to return a single array, false to return multiple entries mainly for garage).
 */
-private ["_queryStmt","_mode","_multiarr","_queryResult","_key","_return","_loop"];
-_queryStmt = [_this,0,"",[""]] call BIS_fnc_param;
-_mode = [_this,1,1,[0]] call BIS_fnc_param;
-_multiarr = [_this,2,false,[false]] call BIS_fnc_param;
+private ["_queryResult","_key","_return","_loop","_pipe"];
+params [
+    ["_queryStmt","",[""]],
+    ["_mode",1,[0]],
+    ["_multiarr",false,[false]]
+];
 
 _key = EXTDB format ["%1:%2:%3",_mode,FETCH_CONST(life_sql_id),_queryStmt];
 
@@ -52,3 +54,4 @@ if (!_multiarr && count _return > 0) then {
 };
 
 _return;
+

life_server/Functions/MySQL/fn_bool.sqf

@@ -6,9 +6,10 @@
     Handles bool conversion for MySQL since MySQL doesn't support 'true' or 'false'
     instead MySQL uses Tinyint for BOOLEAN (0 = false, 1 = true)
 */
-private ["_bool","_mode"];
-_bool = [_this,0,0,[false,0]] call BIS_fnc_param;
-_mode = [_this,1,0,[0]] call BIS_fnc_param;
+params [
+    ["_bool",0,[false,0]],
+    ["_mode",0,[0]]
+];
 
 switch (_mode) do {
     case 0: {

life_server/Functions/MySQL/fn_insertVehicle.sqf

@@ -5,20 +5,20 @@
     Description:
     Inserts the vehicle into the database
 */
-private ["_query","_sql"];
+
 params [
-    "_uid",
-    "_side",
-    "_type",
-    "_className",
+    ["_uid","",[""]],
+    ["_side",sideUnknown,[civilian]],
+    ["_type","",[""]],
+    ["_className","",[""]],
     ["_color",-1,[0]],
     ["_plate",-1,[0]]
 ];
 
 //Stop bad data being passed.
 if (_uid isEqualTo "" || _side isEqualTo "" || _type isEqualTo "" || _className isEqualTo "" || _color isEqualTo -1 || _plate isEqualTo -1) exitWith {};
 
-_query = format ["INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear, damage) VALUES ('%1', '%2', '%3', '%4', '1','1','""[[],0]""', '%5', '%6','""[]""','""[]""')",_side,_className,_type,_uid,_color,_plate];
+private _query = format ["INSERT INTO vehicles (side, classname, type, pid, alive, active, inventory, color, plate, gear, damage) VALUES ('%1', '%2', '%3', '%4', '1','1','""[[],0]""', '%5', '%6','""[]""','""[]""')",_side,_className,_type,_uid,_color,_plate];
 
 
 [_query,1] call DB_fnc_asyncCall;

life_server/Functions/MySQL/fn_mresArray.sqf

@@ -8,7 +8,7 @@
     any problems. The return method is 'hacky' but it's effective.
 */
 private ["_array"];
-_array = [_this,0,[],[[]]] call BIS_fnc_param;
+_array = param [0,[],[[]]];
 _array = str _array;
 _array = toArray(_array);
 

life_server/Functions/MySQL/fn_mresString.sqf

@@ -6,7 +6,7 @@
     Makes the string safe to be passed to MySQL (strips various stuff).
 */
 private ["_string","_filter"];
-_string = [_this,0,"",[""]] call BIS_fnc_param;
+_string = param [0,"",[""]];
 _filter = "'/\`:|;,{}-""<>";
 
 _string = toArray _string; //Blow it up to an array

life_server/Functions/MySQL/fn_mresToArray.sqf

@@ -8,19 +8,19 @@
     any problems. The return method is 'hacky' but it's effective.
 */
 private ["_array"];
-_array = [_this,0,"",[""]] call BIS_fnc_param;
+_array = param [0,"",[""]];
 if (_array isEqualTo "") exitWith {[]};
 _array = toArray(_array);
 
 for "_i" from 0 to (count _array)-1 do
 {
     _sel = _array select _i;
-    if (_sel == 96) then
+    if (_sel IsEqualTo 96) then
     {
         _array set[_i,39];
     };
 };
 
 _array = toString(_array);
 _array = call compile format ["%1", _array];
-_array;
+_array;

life_server/Functions/MySQL/fn_numberSafe.sqf

@@ -11,10 +11,12 @@
     Returns:
     STRING
 */
-private ["_number","_mod","_digots","_digitsCount","_modBase","_numberText"];
+private ["_digitsCount","_modBase","_numberText"];
 
-_number = [_this,0,0,[0]] call bis_fnc_param;
-_mod = [_this,1,3,[0]] call bis_fnc_param;
+params [
+    ["_number",0,[0]],
+    ["_mod",3,[0]]
+];
 
 _digits = _number call bis_fnc_numberDigits;
 _digitsCount = count _digits - 1;
@@ -25,4 +27,4 @@ _numberText = "";
     _numberText = _numberText + str _x;
     if ((_foreachindex - _modBase) % (_mod) isEqualTo 0 && !(_foreachindex isEqualTo _digitsCount)) then {_numberText = _numberText + "";};
 } forEach _digits;
-_numberText
+_numberText;

life_server/Functions/MySQL/fn_queryRequest.sqf

@@ -11,17 +11,17 @@
     ARRAY - If array has 0 elements it should be handled as an error in client-side files.
     STRING - The request had invalid handles or an unknown error and is logged to the RPT.
 */
-private ["_uid","_side","_query","_queryResult","_tickTime","_tmp"];
-_uid = [_this,0,"",[""]] call BIS_fnc_param;
-_side = [_this,1,sideUnknown,[civilian]] call BIS_fnc_param;
-_ownerID = [_this,2,objNull,[objNull]] call BIS_fnc_param;
+private ["_query","_queryResult","_tickTime","_tmp","_new","_old"];
+params [
+    [_uid,"",[""]],
+    [_side,sideUnknown,[civilian]],
+    [_ownerID,objNull,[objNull]]
+];
 
 if (isNull _ownerID) exitWith {};
-
 if (LIFE_SETTINGS(getNumber,"player_deathLog") isEqualTo 1) then {
     _ownerID addMPEventHandler ["MPKilled", {_this call fn_whoDoneIt}];
 };
-
 _ownerID = owner _ownerID;
 
 _query = switch (_side) do {

life_server/Functions/MySQL/fn_updatePartial.sqf

@@ -6,29 +6,32 @@
     Takes partial data of a player and updates it, this is meant to be
     less network intensive towards data flowing through it for updates.
 */
-private ["_uid","_side","_value","_value1","_value2","_mode","_query"];
-_uid = [_this,0,"",[""]] call BIS_fnc_param;
-_side = [_this,1,sideUnknown,[civilian]] call BIS_fnc_param;
-_mode = [_this,3,-1,[0]] call BIS_fnc_param;
+private ["_value","_value1","_value2","_query","_bool","_array"];
+
+params [
+    ["_uid","",[""]],
+    ["_side",sideUnknown,[civilian]],
+    ["_mode",-1,[0]]
+];
 
 if (_uid isEqualTo "" || _side isEqualTo sideUnknown) exitWith {}; //Bad.
 _query = "";
 
 switch (_mode) do {
     case 0: {
-        _value = [_this,2,0,[0]] call BIS_fnc_param;
+        _value = param [2,0,[0]];
         _value = [_value] call DB_fnc_numberSafe;
         _query = format ["UPDATE players SET cash='%1' WHERE pid='%2'",_value,_uid];
     };
 
     case 1: {
-        _value = [_this,2,0,[0]] call BIS_fnc_param;
+        _value = param [2,0,[0]];
         _value = [_value] call DB_fnc_numberSafe;
         _query = format ["UPDATE players SET bankacc='%1' WHERE pid='%2'",_value,_uid];
     };
 
     case 2: {
-        _value = [_this,2,[],[[]]] call BIS_fnc_param;
+        _value = param [2,[],[[]]];
         //Does something license related but I can't remember I only know it's important?
         for "_i" from 0 to count(_value)-1 do {
             _bool = [(_value select _i) select 1] call DB_fnc_bool;
@@ -43,7 +46,7 @@ switch (_mode) do {
     };
 
     case 3: {
-        _value = [_this,2,[],[[]]] call BIS_fnc_param;
+        _value = param [2,[],[[]]];
         _value = [_value] call DB_fnc_mresArray;
         switch (_side) do {
             case west: {_query = format ["UPDATE players SET cop_gear='%1' WHERE pid='%2'",_value,_uid];};
@@ -53,30 +56,30 @@ switch (_mode) do {
     };
 
     case 4: {
-        _value = [_this,2,false,[true]] call BIS_fnc_param;
+        _value = param [2,false,[true]];
         _value = [_value] call DB_fnc_bool;
-        _value2 = [_this,4,[],[[]]] call BIS_fnc_param;
+        _value2 = param [4,[],[[]]];
         _value2 = if (count _value2 isEqualTo 3) then {_value2} else {[0,0,0]};
         _value2 = [_value2] call DB_fnc_mresArray;
         _query = format ["UPDATE players SET civ_alive='%1', civ_position='%2' WHERE pid='%3'",_value,_value2,_uid];
     };
 
     case 5: {
-        _value = [_this,2,false,[true]] call BIS_fnc_param;
+        _value = param [2,false,[true]];
         _value = [_value] call DB_fnc_bool;
         _query = format ["UPDATE players SET arrested='%1' WHERE pid='%2'",_value,_uid];
     };
 
     case 6: {
-        _value1 = [_this,2,0,[0]] call BIS_fnc_param;
-        _value2 = [_this,4,0,[0]] call BIS_fnc_param;
+        _value1 = param [2,0,[0]];
+        _value2 = param [4,0,[0]];
         _value1 = [_value1] call DB_fnc_numberSafe;
         _value2 = [_value2] call DB_fnc_numberSafe;
         _query = format ["UPDATE players SET cash='%1', bankacc='%2' WHERE pid='%3'",_value1,_value2,_uid];
     };
 
     case 7: {
-        _array = [_this,2,[],[[]]] call BIS_fnc_param;
+        _array = param [_this,2,[],[[]]];
         [_uid,_side,_array,0] call TON_fnc_keyManagement;
     };
 };

life_server/Functions/MySQL/fn_updateRequest.sqf

@@ -6,17 +6,19 @@
     Updates ALL player information in the database.
     Information gets passed here from the client side file: core\session\fn_updateRequest.sqf
 */
-private ["_uid","_side","_cash","_bank","_licenses","_gear","_stats","_name","_alive","_position","_query","_thread"];
-_uid = [_this,0,"",[""]] call BIS_fnc_param;
-_name = [_this,1,"",[""]] call BIS_fnc_param;
-_side = [_this,2,sideUnknown,[civilian]] call BIS_fnc_param;
-_cash = [_this,3,0,[0]] call BIS_fnc_param;
-_bank = [_this,4,5000,[0]] call BIS_fnc_param;
-_licenses = [_this,5,[],[[]]] call BIS_fnc_param;
-_gear = [_this,6,[],[[]]] call BIS_fnc_param;
-_stats = [_this,7,[100,100],[[]]] call BIS_fnc_param;
-_alive = [_this,9,false,[true]] call BIS_fnc_param;
-_position = [_this,10,[],[[]]] call BIS_fnc_param;
+private ["_bool","_playtime","_playtime_update","_query"];
+params [
+    ["_uid","",[""]],
+    ["_name","",[""]],
+    ["_side",sideUnknown,[civilian]],
+    ["_cash",0,[0]],
+    ["_bank",5000,[0]],
+    ["_licenses",[],[[]]],
+    ["_gear",[],[[]]],
+    ["_stats",[100,100],[[]]],
+    ["_alive",false,[true]],
+    ["_position",[],[[]]]
+];
 
 //Get to those error checks.
 if ((_uid isEqualTo "") || (_name isEqualTo "")) exitWith {};
@@ -61,4 +63,4 @@ switch (_side) do {
 };
 
 
-_queryResult = [_query,1] call DB_fnc_asyncCall;
+[_query,1] call DB_fnc_asyncCall;

life_server/Functions/Systems/fn_cleanupRequest.sqf

@@ -7,8 +7,8 @@
     the server will then monitor when that client aborts and
     delete the weapon holders.
 */
-private ["_client","_loops"];
-_client = [_this,0,objNull,[objNull]] call BIS_fnc_param;
+private ["_client","_loops","_containers"];
+_client = param [0,objNull,[objNull]];
 if (isNull _client) exitWith {};
 
 _loops = 0;

life_server/Functions/Systems/fn_getVehicles.sqf

@@ -6,11 +6,13 @@
     Description:
     Sends a request to query the database information and returns vehicles.
 */
-private ["_pid","_side","_type","_unit","_ret","_tickTime","_queryResult"];
-_pid = [_this,0,"",[""]] call BIS_fnc_param;
-_side = [_this,1,sideUnknown,[west]] call BIS_fnc_param;
-_type = [_this,2,"",[""]] call BIS_fnc_param;
-_unit = [_this,3,objNull,[objNull]] call BIS_fnc_param;
+private ["_tickTime","_queryResult"];
+params [
+    ["_pid","",[""]],
+    ["_side",sideUnknown,[west]],
+    ["_type","",[""]],
+    ["_unit",objNull,[objNull]]
+];
 
 //Error checks
 if (_pid isEqualTo "" || _side isEqualTo sideUnknown || _type isEqualTo "" || isNull _unit) exitWith {
@@ -27,7 +29,7 @@ _side = switch (_side) do {
     default {"Error"};
 };
 
-if (_side == "Error") exitWith {
+if (_side IsEqualTo "Error") exitWith {
     [[]] remoteExec ["life_fnc_impoundMenu",(owner _unit)];
 };
 

life_server/Functions/Systems/fn_huntingZone.sqf

@@ -10,10 +10,10 @@
     Change it up so animals repopulate over time.
 */
 
-private ["_animalList","_dist","_radius","_zoneName","_unitsNear","_animalsActive"];
+private ["_animalList","_dist","_radius","_unitsNear","_animalsActive","_zone"];
 params [
-        ["_zoneName","",[""]],
-        ["_maxAnimals",10,[0]]
+    ["_zoneName","",[""]],
+    ["_maxAnimals",10,[0]]
 ];
 
 if (_zoneName isEqualTo "") exitWith {};

life_server/Functions/Systems/fn_keyManagement.sqf

@@ -5,16 +5,19 @@
     Description:
     Keeps track of an array locally on the server of a players keys.
 */
-private ["_uid","_side","_input","_mode","_arr"];
-_uid = [_this,0,"",[""]] call BIS_fnc_param;
-_side = [_this,1,sideUnknown,[sideUnknown]] call BIS_fnc_param;
-_mode = [_this,3,0,[0]] call BIS_fnc_param;
+private ["_input","_arr"];
+params [
+    ["_uid","",[""]],
+    ["_side",sideUnknown,[sideUnknown]],
+    "",
+    ["_mode",0,[0]]
+];
 
 if (_uid isEqualTo "" || _side isEqualTo sideUnknown) exitWith {}; //BAAAAAAAAADDDDDDDD
 
 switch (_mode) do {
     case 0: {
-        _input = [_this,2,[],[[]]] call BIS_fnc_param;
+        _input = param [2,[],[[]]];
         _arr = [];
         {
             if (!isNull _x && {!(_x isKindOf "House")}) then {
@@ -27,7 +30,7 @@ switch (_mode) do {
     };
 
     case 1: {
-        _input = [_this,2,objNull,[objNull]] call BIS_fnc_param;
+        _input = param [2,objNull,[objNull]];
         if (isNull _input || _input isKindOf "House") exitWith {};
         _arr = missionNamespace getVariable [format ["%1_KEYS_%2",_uid,_side],[]];
         _arr pushBack _input;
@@ -40,4 +43,4 @@ switch (_mode) do {
         _arr = _arr - [objNull];
         missionNamespace setVariable [format ["%1_KEYS_%2",_uid,_side],_arr];
     };
-};
+};