From 29f440a96b69c50195b8e27c3d151abe0a36f44d Mon Sep 17 00:00:00 2001 From: Edward Date: Wed, 25 Mar 2020 19:02:23 +0100 Subject: [PATCH 1/2] call compile > parseSimpleArray --- Altis_Life.Altis/core/actions/fn_getDPMission.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminFreeze.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminGetID.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminQuery.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminSpectate.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminTpHere.sqf | 2 +- Altis_Life.Altis/core/cop/fn_wantedGrab.sqf | 2 +- Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf | 2 +- Altis_Life.Altis/core/gangs/fn_gangKick.sqf | 2 +- Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf | 2 +- Altis_Life.Altis/core/housing/fn_initHouses.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_giveItem.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_keyGive.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_pardon.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf | 2 +- Altis_Life.Altis/core/session/fn_requestReceived.sqf | 2 +- Altis_Life.Altis/core/shops/fn_levelCheck.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_sellGarage.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf | 8 ++++---- Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_unimpound.sqf | 2 +- life_hc/MySQL/General/fn_asyncCall.sqf | 4 ++-- life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf | 10 +++++----- life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf | 2 +- life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf | 2 +- life_server/Functions/Housing/fn_fetchPlayerHouses.sqf | 10 +++++----- life_server/Functions/Housing/fn_initHouses.sqf | 2 +- life_server/Functions/MySQL/fn_asyncCall.sqf | 4 ++-- life_server/Functions/WantedSystem/fn_wantedAdd.sqf | 2 +- life_server/Functions/WantedSystem/fn_wantedCrimes.sqf | 2 +- life_server/functions.sqf | 4 ++-- 34 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Altis_Life.Altis/core/actions/fn_getDPMission.sqf b/Altis_Life.Altis/core/actions/fn_getDPMission.sqf index e38466fa9..41c3ad09f 100644 --- a/Altis_Life.Altis/core/actions/fn_getDPMission.sqf +++ b/Altis_Life.Altis/core/actions/fn_getDPMission.sqf @@ -24,7 +24,7 @@ if (str(_target) in LIFE_SETTINGS(getArray,"delivery_points")) then { life_dp_start = _target; life_delivery_in_progress = true; -life_dp_point = call compile format ["%1",_dp]; +life_dp_point = parseSimpleArray format ["%1",_dp]; _dp = toUpper((_dp splitString "_") joinString " "); life_cur_task = player createSimpleTask [format ["Delivery_%1",life_dp_point]]; diff --git a/Altis_Life.Altis/core/admin/fn_adminFreeze.sqf b/Altis_Life.Altis/core/admin/fn_adminFreeze.sqf index e34c452f2..ca8e208fd 100644 --- a/Altis_Life.Altis/core/admin/fn_adminFreeze.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminFreeze.sqf @@ -8,7 +8,7 @@ if (FETCH_CONST(life_adminlevel) < 4) exitWith {closeDialog 0; hint localize "STR_ANOTF_ErrorLevel";}; private _unit = lbData[2902,lbCurSel (2902)]; -_unit = call compile format ["%1", _unit]; +_unit = parseSimpleArray format ["%1", _unit]; if (isNil "_unit") exitWith {}; if (isNull _unit) exitWith {}; if (_unit == player) exitWith {hint localize "STR_ANOTF_Error";}; diff --git a/Altis_Life.Altis/core/admin/fn_adminGetID.sqf b/Altis_Life.Altis/core/admin/fn_adminGetID.sqf index 3c84c1e43..c9b0d5e9f 100644 --- a/Altis_Life.Altis/core/admin/fn_adminGetID.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminGetID.sqf @@ -8,7 +8,7 @@ https://community.bistudio.com/wiki/Multiplayer_Server_Commands */ private _unit = lbData[2902,lbCurSel (2902)]; -_unit = call compile format ["%1", _unit]; +_unit = parseSimpleArray format ["%1", _unit]; if (isNil "_unit") exitWith {}; if (isNull _unit) exitWith {}; diff --git a/Altis_Life.Altis/core/admin/fn_adminQuery.sqf b/Altis_Life.Altis/core/admin/fn_adminQuery.sqf index a3bef64e8..ffb512108 100644 --- a/Altis_Life.Altis/core/admin/fn_adminQuery.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminQuery.sqf @@ -11,7 +11,7 @@ disableSerialization; if (!isNil "admin_query_ip") exitWith {hint localize "STR_ANOTF_Query_2"}; _text = CONTROL(2900,2903); _info = lbData[2902,lbCurSel (2902)]; -_info = call compile format ["%1", _info]; +_info = parseSimpleArray format ["%1", _info]; if (isNil "_info") exitWith {_text ctrlSetText localize "STR_ANOTF_QueryFail";}; if (isNull _info) exitWith {_text ctrlSetText localize "STR_ANOTF_QueryFail";}; diff --git a/Altis_Life.Altis/core/admin/fn_adminSpectate.sqf b/Altis_Life.Altis/core/admin/fn_adminSpectate.sqf index a15ff2cf9..de35528b9 100644 --- a/Altis_Life.Altis/core/admin/fn_adminSpectate.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminSpectate.sqf @@ -9,7 +9,7 @@ if (FETCH_CONST(life_adminlevel) < 3) exitWith {closeDialog 0;}; private _unit = lbData[2902,lbCurSel (2902)]; -_unit = call compile format ["%1", _unit]; +_unit = parseSimpleArray format ["%1", _unit]; if (isNil "_unit") exitWith {}; if (isNull _unit) exitWith {}; if (_unit == player) exitWith {hint localize "STR_ANOTF_Error";}; diff --git a/Altis_Life.Altis/core/admin/fn_adminTpHere.sqf b/Altis_Life.Altis/core/admin/fn_adminTpHere.sqf index 7bf0f9872..98c1cdab1 100644 --- a/Altis_Life.Altis/core/admin/fn_adminTpHere.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminTpHere.sqf @@ -9,7 +9,7 @@ if (FETCH_CONST(life_adminlevel) < 4) exitWith {closeDialog 0;}; private _target = lbData[2902,lbCurSel (2902)]; -_target = call compile format ["%1", _target]; +_target = parseSimpleArray format ["%1", _target]; if (isNil "_target" || isNull _target) exitWith {}; if (_target == player) exitWith {hint localize "STR_ANOTF_Error";}; diff --git a/Altis_Life.Altis/core/cop/fn_wantedGrab.sqf b/Altis_Life.Altis/core/cop/fn_wantedGrab.sqf index deaa3587c..2cd9d55e9 100644 --- a/Altis_Life.Altis/core/cop/fn_wantedGrab.sqf +++ b/Altis_Life.Altis/core/cop/fn_wantedGrab.sqf @@ -11,7 +11,7 @@ disableSerialization; _display = findDisplay 2400; _tab = _display displayCtrl 2402; _criminal = lbData[2401,(lbCurSel 2401)]; -_criminal = call compile format ["%1", _criminal]; +_criminal = parseSimpleArray format ["%1", _criminal]; if (isNil "_criminal") exitWith {}; if (life_HC_isActive) then { diff --git a/Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf b/Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf index a4578e57d..0ec95fb50 100644 --- a/Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf +++ b/Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf @@ -10,7 +10,7 @@ private "_unit"; disableSerialization; if ((lbCurSel 2632) isEqualTo -1) exitWith {hint localize "STR_GNOTF_SelectPerson"}; -_unit = call compile format ["%1",CONTROL_DATA(2632)]; +_unit = parseSimpleArray format ["%1",CONTROL_DATA(2632)]; if (isNull _unit) exitWith {}; //Bad unit? if (_unit == player) exitWith {hint localize "STR_GNOTF_InviteSelf"}; diff --git a/Altis_Life.Altis/core/gangs/fn_gangKick.sqf b/Altis_Life.Altis/core/gangs/fn_gangKick.sqf index 63ef0b7a1..569455a75 100644 --- a/Altis_Life.Altis/core/gangs/fn_gangKick.sqf +++ b/Altis_Life.Altis/core/gangs/fn_gangKick.sqf @@ -10,7 +10,7 @@ private ["_unit","_unitID","_members"]; disableSerialization; if ((lbCurSel 2621) isEqualTo -1) exitWith {hint localize "STR_GNOTF_SelectKick"}; -_unit = call compile format ["%1",CONTROL_DATA(2621)]; +_unit = parseSimpleArray format ["%1",CONTROL_DATA(2621)]; if (isNull _unit) exitWith {}; //Bad unit? if (_unit == player) exitWith {hint localize "STR_GNOTF_KickSelf"}; diff --git a/Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf b/Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf index d484cd744..4652e28c0 100644 --- a/Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf +++ b/Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf @@ -10,7 +10,7 @@ private ["_unit","_unitID","_members","_action","_index"]; disableSerialization; if ((lbCurSel 2621) isEqualTo -1) exitWith {hint localize "STR_GNOTF_TransferSelect"}; -_unit = call compile format ["%1",CONTROL_DATA(2621)]; +_unit = parseSimpleArray format ["%1",CONTROL_DATA(2621)]; if (isNull _unit) exitWith {}; //Bad unit? if (_unit == player) exitWith {hint localize "STR_GNOTF_TransferSelf"}; diff --git a/Altis_Life.Altis/core/housing/fn_initHouses.sqf b/Altis_Life.Altis/core/housing/fn_initHouses.sqf index 4ce0d34f9..e341b633c 100644 --- a/Altis_Life.Altis/core/housing/fn_initHouses.sqf +++ b/Altis_Life.Altis/core/housing/fn_initHouses.sqf @@ -8,7 +8,7 @@ if (life_houses isEqualTo []) exitWith {}; //Nothing to do. { - _position = call compile format ["%1",_x select 0]; + _position = parseSimpleArray format ["%1",_x select 0]; _house = nearestObject [_position, "House"]; _house setVariable ["uid",round(random 99999),true]; _houseName = getText(configFile >> "CfgVehicles" >> (typeOf _house) >> "displayName"); diff --git a/Altis_Life.Altis/core/pmenu/fn_giveItem.sqf b/Altis_Life.Altis/core/pmenu/fn_giveItem.sqf index 3b5746677..dcbb09bfe 100644 --- a/Altis_Life.Altis/core/pmenu/fn_giveItem.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_giveItem.sqf @@ -25,7 +25,7 @@ call { private _unit = lbData [2023, lbCurSel 2023]; - _unit = call compile format ["%1",_unit]; + _unit = parseSimpleArray format ["%1",_unit]; if (isNil "_unit") exitWith { hint localize "STR_NOTF_notWithinRange"; diff --git a/Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf b/Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf index 5e5fce9ab..aaff1fb6e 100644 --- a/Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf @@ -11,7 +11,7 @@ _amount = ctrlText 2018; ctrlShow[2001,false]; if ((lbCurSel 2022) isEqualTo -1) exitWith {hint localize "STR_NOTF_noOneSelected";ctrlShow[2001,true];}; _unit = lbData [2022,lbCurSel 2022]; -_unit = call compile format ["%1",_unit]; +_unit = parseSimpleArray format ["%1",_unit]; if (isNil "_unit") exitWith {ctrlShow[2001,true];}; if (_unit == player) exitWith {ctrlShow[2001,true];}; if (isNull _unit) exitWith {ctrlShow[2001,true];}; diff --git a/Altis_Life.Altis/core/pmenu/fn_keyGive.sqf b/Altis_Life.Altis/core/pmenu/fn_keyGive.sqf index 599a24b5c..0d8940b83 100644 --- a/Altis_Life.Altis/core/pmenu/fn_keyGive.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_keyGive.sqf @@ -22,7 +22,7 @@ _vehicle = life_vehicles select parseNumber(_vehicle); if ((lbCurSel 2702) isEqualTo -1) exitWith {hint localize "STR_NOTF_didNotSelectPlayer";}; _sel = lbCurSel _plist; _unit = _plist lbData _sel; -_unit = call compile format ["%1", _unit]; +_unit = parseSimpleArray format ["%1", _unit]; if (isNull _unit || isNil "_unit") exitWith {}; if (_unit == player) exitWith {}; diff --git a/Altis_Life.Altis/core/pmenu/fn_pardon.sqf b/Altis_Life.Altis/core/pmenu/fn_pardon.sqf index 7d1ef1346..94b22cde6 100644 --- a/Altis_Life.Altis/core/pmenu/fn_pardon.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_pardon.sqf @@ -13,7 +13,7 @@ if !(playerSide isEqualTo west) exitWith {}; _display = findDisplay 2400; _list = _display displayCtrl 2402; _data = lbData[2401,(lbCurSel 2401)]; -_data = call compile format ["%1", _data]; +_data = parseSimpleArray format ["%1", _data]; if (isNil "_data") exitWith {}; if (!(_data isEqualType [])) exitWith {}; if (_data isEqualTo []) exitWith {}; diff --git a/Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf b/Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf index ff3e0e68c..562056392 100644 --- a/Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf @@ -10,7 +10,7 @@ if !(playerSide isEqualTo west) exitWith {hint localize "STR_Cop_wantedList_notC if ((lbCurSel 2406) isEqualTo -1) exitWith {hint localize "STR_Cop_wantedList_noPlayerSelected";}; if ((lbCurSel 2407) isEqualTo -1) exitWith {hint localize "STR_Cop_wantedList_noCrimeSelected";}; private _unit = lbData [2406,lbCurSel 2406]; -_unit = call compile format ["%1",_unit]; +_unit = parseSimpleArray format ["%1",_unit]; private _amount = lbData [2407,lbCurSel 2407]; if (isNil "_unit") exitWith {}; if (isNull _unit) exitWith {}; diff --git a/Altis_Life.Altis/core/session/fn_requestReceived.sqf b/Altis_Life.Altis/core/session/fn_requestReceived.sqf index 8a349d3c0..04c652032 100755 --- a/Altis_Life.Altis/core/session/fn_requestReceived.sqf +++ b/Altis_Life.Altis/core/session/fn_requestReceived.sqf @@ -82,7 +82,7 @@ switch (playerSide) do { }; { - _house = nearestObject [(call compile format ["%1",(_x select 0)]), "House"]; + _house = nearestObject [(parseSimpleArray format ["%1",(_x select 0)]), "House"]; life_vehicles pushBack _house; } forEach life_houses; diff --git a/Altis_Life.Altis/core/shops/fn_levelCheck.sqf b/Altis_Life.Altis/core/shops/fn_levelCheck.sqf index 9121037a2..6c613c65f 100644 --- a/Altis_Life.Altis/core/shops/fn_levelCheck.sqf +++ b/Altis_Life.Altis/core/shops/fn_levelCheck.sqf @@ -25,7 +25,7 @@ if (_itemConfig isEqualType []) then { if (_itemConfig isEqualTo "") exitWith {true}; -private _evaluation = call compile _itemConfig; +private _evaluation = parseSimpleArray _itemConfig; if (_evaluation isEqualType true) then { if (_evaluation) then { diff --git a/Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf b/Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf index ceed20547..45f9d532f 100644 --- a/Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf +++ b/Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf @@ -8,7 +8,7 @@ */ private ["_value","_unit","_tax"]; _value = parseNumber(ctrlText 2702); -_unit = call compile format ["%1",(lbData[2703,(lbCurSel 2703)])]; +_unit = parseSimpleArray format ["%1",(lbData[2703,(lbCurSel 2703)])]; if (isNull _unit) exitWith {}; if ((lbCurSel 2703) isEqualTo -1) exitWith {hint localize "STR_ATM_NoneSelected"}; if (isNil "_unit") exitWith {hint localize "STR_ATM_DoesntExist"}; diff --git a/Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf b/Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf index 21927009c..09d403600 100644 --- a/Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf +++ b/Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf @@ -13,7 +13,7 @@ _index = _this select 1; //Fetch some information. _dataArr = CONTROL_DATAI(_control,_index); -_dataArr = call compile format ["%1",_dataArr]; +_dataArr = parseSimpleArray format ["%1",_dataArr]; _className = (_dataArr select 0); _classNameLife = _className; diff --git a/Altis_Life.Altis/dialog/function/fn_sellGarage.sqf b/Altis_Life.Altis/dialog/function/fn_sellGarage.sqf index c078be048..c2b31af4d 100644 --- a/Altis_Life.Altis/dialog/function/fn_sellGarage.sqf +++ b/Altis_Life.Altis/dialog/function/fn_sellGarage.sqf @@ -10,7 +10,7 @@ private ["_vehicle","_vehicleLife","_vid","_pid","_sellPrice","_multiplier","_pr disableSerialization; if ((lbCurSel 2802) isEqualTo -1) exitWith {hint localize "STR_Global_NoSelection"}; _vehicle = lbData[2802,(lbCurSel 2802)]; -_vehicle = (call compile format ["%1",_vehicle]) select 0; +_vehicle = (parseSimpleArray format ["%1",_vehicle]) select 0; _vehicleLife = _vehicle; _vid = lbValue[2802,(lbCurSel 2802)]; _pid = getPlayerUID player; diff --git a/Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf b/Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf index 603f50fcb..249881bde 100644 --- a/Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf +++ b/Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf @@ -14,10 +14,10 @@ if (life_spawn_point isEqualTo []) then { _sp = _spCfg select 0; if (playerSide isEqualTo civilian) then { - if (isNil {(call compile format ["%1",_sp select 0])}) then { + if (isNil {(parseSimpleArray format ["%1",_sp select 0])}) then { player setPos (getMarkerPos (_sp select 0)); } else { - _spawnPos = selectRandom (call compile format ["%1",_sp select 0]); + _spawnPos = selectRandom (parseSimpleArray format ["%1",_sp select 0]); _spawnPos = _spawnPos buildingPos 0; player setPos _spawnPos; }; @@ -27,7 +27,7 @@ if (life_spawn_point isEqualTo []) then { titleText[format ["%2 %1",_sp select 1,localize "STR_Spawn_Spawned"],"BLACK IN"]; } else { if (playerSide isEqualTo civilian) then { - if (isNil {(call compile format ["%1",life_spawn_point select 0])}) then { + if (isNil {(parseSimpleArray format ["%1",life_spawn_point select 0])}) then { if (((life_spawn_point select 0) find "house") != -1) then { private ["_bPos","_house","_pos"]; @@ -45,7 +45,7 @@ if (life_spawn_point isEqualTo []) then { player setPos (getMarkerPos (life_spawn_point select 0)); }; } else { - _spawnPos = selectRandom (call compile format ["%1", life_spawn_point select 0]); + _spawnPos = selectRandom (parseSimpleArray format ["%1", life_spawn_point select 0]); _spawnPos = _spawnPos buildingPos 0; player setPos _spawnPos; }; diff --git a/Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf b/Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf index ed4199505..dfc5b7ba0 100644 --- a/Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf +++ b/Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf @@ -41,7 +41,7 @@ for "_i" from 0 to count(_spawnCfg)-1 do { if (playerSide isEqualTo civilian) then { if (count life_houses > 0) then { { - _pos = call compile format ["%1",(_x select 0)]; + _pos = parseSimpleArray format ["%1",(_x select 0)]; _house = nearestObject [_pos, "House"]; _houseName = getText(configFile >> "CfgVehicles" >> (typeOf _house) >> "displayName"); _return pushBack [format ["house_%1",_house getVariable "uid"],_houseName,"\a3\ui_f\data\map\MapControl\lighthouse_ca.paa"]; diff --git a/Altis_Life.Altis/dialog/function/fn_unimpound.sqf b/Altis_Life.Altis/dialog/function/fn_unimpound.sqf index 9e13093e4..a43ebf1a3 100644 --- a/Altis_Life.Altis/dialog/function/fn_unimpound.sqf +++ b/Altis_Life.Altis/dialog/function/fn_unimpound.sqf @@ -10,7 +10,7 @@ private ["_vehicle","_vehicleLife","_vid","_pid","_unit","_price","_price","_sto disableSerialization; if ((lbCurSel 2802) isEqualTo -1) exitWith {hint localize "STR_Global_NoSelection"}; _vehicle = lbData[2802,(lbCurSel 2802)]; -_vehicle = (call compile format ["%1",_vehicle]) select 0; +_vehicle = (parseSimpleArray format ["%1",_vehicle]) select 0; _vehicleLife = _vehicle; _vid = lbValue[2802,(lbCurSel 2802)]; _pid = getPlayerUID player; diff --git a/life_hc/MySQL/General/fn_asyncCall.sqf b/life_hc/MySQL/General/fn_asyncCall.sqf index 4eabe4566..9f4c6f6d5 100644 --- a/life_hc/MySQL/General/fn_asyncCall.sqf +++ b/life_hc/MySQL/General/fn_asyncCall.sqf @@ -20,7 +20,7 @@ _key = EXTDB format ["%1:%2:%3",_mode,FETCH_CONST(life_sql_id),_queryStmt]; if (_mode isEqualTo 1) exitWith {true}; -_key = call compile format ["%1",_key]; +_key = parseSimpleArray format ["%1",_key]; _key = (_key select 1); _queryResult = EXTDB format ["4:%1", _key]; @@ -44,7 +44,7 @@ if (_queryResult isEqualTo "[5]") then { if (!_loop) exitWith {}; }; }; -_queryResult = call compile _queryResult; +_queryResult = parseSimpleArray _queryResult; if ((_queryResult select 0) isEqualTo 0) exitWith {diag_log format ["extDB3: Protocol Error: %1", _queryResult]; []}; _return = (_queryResult select 1); if (!_multiarr && count _return > 0) then { diff --git a/life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf b/life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf index 368060a29..07363a139 100755 --- a/life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf +++ b/life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf @@ -22,13 +22,13 @@ private _containers = [_query, 2, true] call HC_fnc_asyncCall; private _containerss = []; { - _position = call compile format ["%1",_x select 1]; + _position = parseSimpleArray format ["%1",_x select 1]; _house = nearestObject [_position, "House"]; - _direction = call compile format ["%1",_x select 5]; + _direction = parseSimpleArray format ["%1",_x select 5]; _trunk = _x select 3; - if (_trunk isEqualType "") then {_trunk = call compile format ["%1", _trunk];}; + if (_trunk isEqualType "") then {_trunk = parseSimpleArray format ["%1", _trunk];}; _gear = _x select 4; - if (_gear isEqualType "") then {_gear = call compile format ["%1", _gear];}; + if (_gear isEqualType "") then {_gear = parseSimpleArray format ["%1", _gear];}; _container = createVehicle[_x select 2,[0,0,999],[],0,"NONE"]; waitUntil {!isNil "_container" && {!isNull _container}}; _containerss = _house getVariable ["containers",[]]; @@ -79,7 +79,7 @@ private _houses = [_query, 2, true] call HC_fnc_asyncCall; _return = []; { - _pos = call compile format ["%1",_x select 1]; + _pos = parseSimpleArray format ["%1",_x select 1]; _house = nearestObject [_pos, "House"]; _house allowDamage false; _return pushBack [_x select 1]; diff --git a/life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf b/life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf index 5e99e944d..cb5ed5415 100755 --- a/life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf +++ b/life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf @@ -43,7 +43,7 @@ if !(_queryResult isEqualTo []) then { _queryResult = [_query,2] call HC_fnc_asyncCall; _pastCrimes = _queryResult select 0; - if (_pastCrimes isEqualType "") then {_pastCrimes = call compile format ["%1", _pastCrimes];}; + if (_pastCrimes isEqualType "") then {_pastCrimes = parseSimpleArray format ["%1", _pastCrimes];}; _pastCrimes pushBack _number; _query = format ["updateWanted:%1:%2:%3", _pastCrimes, _val, _uid]; [_query,1] call HC_fnc_asyncCall; diff --git a/life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf b/life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf index 562c904af..8d1a7c02e 100755 --- a/life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf +++ b/life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf @@ -22,7 +22,7 @@ private _query = format ["selectWantedActive:%1", _criminal select 0]; private _queryResult = [_query, 2] call HC_fnc_asyncCall; private _type = _queryResult select 0; -if (_type isEqualType "") then {_type = call compile format ["%1", _type];}; +if (_type isEqualType "") then {_type = parseSimpleArray format ["%1", _type];}; private _crimesArr = []; { diff --git a/life_server/Functions/Housing/fn_fetchPlayerHouses.sqf b/life_server/Functions/Housing/fn_fetchPlayerHouses.sqf index 38bfd9b11..d1cec8019 100755 --- a/life_server/Functions/Housing/fn_fetchPlayerHouses.sqf +++ b/life_server/Functions/Housing/fn_fetchPlayerHouses.sqf @@ -20,13 +20,13 @@ private _containers = [_query, 2, true] call DB_fnc_asyncCall; private _containerss = []; { - _position = call compile format ["%1",_x select 1]; + _position = parseSimpleArray format ["%1",_x select 1]; _house = nearestObject [_position, "House"]; - _direction = call compile format ["%1",_x select 5]; + _direction = parseSimpleArray format ["%1",_x select 5]; _trunk = _x select 3; - if (_trunk isEqualType "") then {_trunk = call compile format ["%1", _trunk];}; + if (_trunk isEqualType "") then {_trunk = parseSimpleArray format ["%1", _trunk];}; _gear = _x select 4; - if (_gear isEqualType "") then {_gear = call compile format ["%1", _gear];}; + if (_gear isEqualType "") then {_gear = parseSimpleArray format ["%1", _gear];}; _container = createVehicle[_x select 2,[0,0,999],[],0,"NONE"]; waitUntil {!isNil "_container" && {!isNull _container}}; _containerss = _house getVariable ["containers",[]]; @@ -77,7 +77,7 @@ private _houses = [_query, 2, true] call DB_fnc_asyncCall; _return = []; { - _pos = call compile format ["%1",_x select 1]; + _pos = parseSimpleArray format ["%1",_x select 1]; _house = nearestObject [_pos, "House"]; _house allowDamage false; _return pushBack [_x select 1]; diff --git a/life_server/Functions/Housing/fn_initHouses.sqf b/life_server/Functions/Housing/fn_initHouses.sqf index 61278a7af..cf082871e 100755 --- a/life_server/Functions/Housing/fn_initHouses.sqf +++ b/life_server/Functions/Housing/fn_initHouses.sqf @@ -11,7 +11,7 @@ for [{_x=0},{_x<=_count},{_x=_x+10}] do { private _queryResult = [_query, 2, true] call DB_fnc_asyncCall; if (_queryResult isEqualTo []) exitWith {}; { - _pos = call compile format ["%1", _x select 2]; + _pos = parseSimpleArray format ["%1", _x select 2]; _house = nearestObject [_pos, "House"]; _house setVariable ["house_owner",[_x select 1, _x select 3],true]; _house setVariable ["house_id", _x select 0, true]; diff --git a/life_server/Functions/MySQL/fn_asyncCall.sqf b/life_server/Functions/MySQL/fn_asyncCall.sqf index cb16a479c..23783980d 100755 --- a/life_server/Functions/MySQL/fn_asyncCall.sqf +++ b/life_server/Functions/MySQL/fn_asyncCall.sqf @@ -22,7 +22,7 @@ private _key = EXTDB format ["%1:%2:%3",_mode,FETCH_CONST(life_sql_id),_queryStm if (_mode isEqualTo 1) exitWith {true}; -_key = call compile format ["%1",_key]; +_key = parseSimpleArray format ["%1",_key]; _key = _key select 1; private _queryResult = EXTDB format ["4:%1", _key]; @@ -46,7 +46,7 @@ if (_queryResult isEqualTo "[5]") then { if (!_loop) exitWith {}; }; }; -_queryResult = call compile _queryResult; +_queryResult = parseSimpleArray _queryResult; if ((_queryResult select 0) isEqualTo 0) exitWith {diag_log format ["extDB3: Protocol Error: %1", _queryResult]; []}; private _return = (_queryResult select 1); if (!_multiarr && {!(_return isEqualTo [])}) then { diff --git a/life_server/Functions/WantedSystem/fn_wantedAdd.sqf b/life_server/Functions/WantedSystem/fn_wantedAdd.sqf index 000efff8d..637093cf9 100755 --- a/life_server/Functions/WantedSystem/fn_wantedAdd.sqf +++ b/life_server/Functions/WantedSystem/fn_wantedAdd.sqf @@ -41,7 +41,7 @@ if !(_queryResult isEqualTo []) then { _queryResult = [_query,2] call DB_fnc_asyncCall; _pastCrimes = _queryResult select 0; - if (_pastCrimes isEqualType "") then {_pastCrimes = call compile format ["%1", _pastCrimes];}; + if (_pastCrimes isEqualType "") then {_pastCrimes = parseSimpleArray format ["%1", _pastCrimes];}; _pastCrimes pushBack _number; _query = format ["updateWanted:%1:%2:%3", _pastCrimes, _val, _uid]; [_query,1] call DB_fnc_asyncCall; diff --git a/life_server/Functions/WantedSystem/fn_wantedCrimes.sqf b/life_server/Functions/WantedSystem/fn_wantedCrimes.sqf index dfdceec55..a228f366e 100755 --- a/life_server/Functions/WantedSystem/fn_wantedCrimes.sqf +++ b/life_server/Functions/WantedSystem/fn_wantedCrimes.sqf @@ -22,7 +22,7 @@ private _queryResult = [_query, 2] call DB_fnc_asyncCall; _ret = owner _ret; private _type = _queryResult select 0; -if (_type isEqualType "") then {_type = call compile format ["%1", _type];}; +if (_type isEqualType "") then {_type = parseSimpleArray format ["%1", _type];}; private _crimesArr = []; { diff --git a/life_server/functions.sqf b/life_server/functions.sqf index d7e1b1f74..15ea30068 100644 --- a/life_server/functions.sqf +++ b/life_server/functions.sqf @@ -151,7 +151,7 @@ compileFinal " if (_length > 400) exitWith {hint localize ""STR_CELLMSG_LIMITEXCEEDED"";ctrlShow[3015,true];}; if (lbCurSel 3004 isEqualTo -1) exitWith {hint localize ""STR_CELLMSG_SelectPerson""; ctrlShow[3015,true];}; - _to = call compile format [""%1"",(lbData[3004,(lbCurSel 3004)])]; + _to = parseSimpleArray format [""%1"",(lbData[3004,(lbCurSel 3004)])]; if (isNull _to) exitWith {ctrlShow[3015,true];}; if (isNil ""_to"") exitWith {ctrlShow[3015,true];}; if (_msg isEqualTo """") exitWith {hint localize ""STR_CELLMSG_EnterMSG"";ctrlShow[3015,true];}; @@ -203,7 +203,7 @@ compileFinal " private [""_msg"",""_to""]; ctrlShow[3020,false]; _msg = ctrlText 3003; - _to = call compile format [""%1"",(lbData[3004,(lbCurSel 3004)])]; + _to = parseSimpleArray format [""%1"",(lbData[3004,(lbCurSel 3004)])]; if (isNull _to) exitWith {ctrlShow[3020,true];}; if (isNil ""_to"") exitWith {ctrlShow[3020,true];}; if (_msg isEqualTo """") exitWith {hint localize ""STR_CELLMSG_EnterMSG"";ctrlShow[3020,true];}; From c4e28fe0c40e586bc4242adec457e00707f9f952 Mon Sep 17 00:00:00 2001 From: Edward Date: Mon, 30 Mar 2020 13:38:03 +0200 Subject: [PATCH 2/2] Tried and cried --- Altis_Life.Altis/core/actions/fn_getDPMission.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminFreeze.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminGetID.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminQuery.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminSpectate.sqf | 2 +- Altis_Life.Altis/core/admin/fn_adminTpHere.sqf | 2 +- Altis_Life.Altis/core/cop/fn_wantedGrab.sqf | 2 +- Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf | 2 +- Altis_Life.Altis/core/gangs/fn_gangKick.sqf | 2 +- Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf | 2 +- Altis_Life.Altis/core/housing/fn_initHouses.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_giveItem.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_keyGive.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_pardon.sqf | 2 +- Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf | 2 +- Altis_Life.Altis/core/session/fn_requestReceived.sqf | 2 +- Altis_Life.Altis/core/shops/fn_levelCheck.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_sellGarage.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf | 8 ++++---- Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf | 2 +- Altis_Life.Altis/dialog/function/fn_unimpound.sqf | 2 +- life_hc/MySQL/General/fn_asyncCall.sqf | 2 +- life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf | 10 +++++----- life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf | 2 +- life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf | 2 +- life_server/Functions/Housing/fn_fetchPlayerHouses.sqf | 10 +++++----- life_server/Functions/Housing/fn_initHouses.sqf | 2 +- life_server/Functions/MySQL/fn_asyncCall.sqf | 2 +- life_server/Functions/WantedSystem/fn_wantedAdd.sqf | 2 +- life_server/Functions/WantedSystem/fn_wantedCrimes.sqf | 2 +- life_server/functions.sqf | 4 ++-- 34 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Altis_Life.Altis/core/actions/fn_getDPMission.sqf b/Altis_Life.Altis/core/actions/fn_getDPMission.sqf index 41c3ad09f..e38466fa9 100644 --- a/Altis_Life.Altis/core/actions/fn_getDPMission.sqf +++ b/Altis_Life.Altis/core/actions/fn_getDPMission.sqf @@ -24,7 +24,7 @@ if (str(_target) in LIFE_SETTINGS(getArray,"delivery_points")) then { life_dp_start = _target; life_delivery_in_progress = true; -life_dp_point = parseSimpleArray format ["%1",_dp]; +life_dp_point = call compile format ["%1",_dp]; _dp = toUpper((_dp splitString "_") joinString " "); life_cur_task = player createSimpleTask [format ["Delivery_%1",life_dp_point]]; diff --git a/Altis_Life.Altis/core/admin/fn_adminFreeze.sqf b/Altis_Life.Altis/core/admin/fn_adminFreeze.sqf index ca8e208fd..e34c452f2 100644 --- a/Altis_Life.Altis/core/admin/fn_adminFreeze.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminFreeze.sqf @@ -8,7 +8,7 @@ if (FETCH_CONST(life_adminlevel) < 4) exitWith {closeDialog 0; hint localize "STR_ANOTF_ErrorLevel";}; private _unit = lbData[2902,lbCurSel (2902)]; -_unit = parseSimpleArray format ["%1", _unit]; +_unit = call compile format ["%1", _unit]; if (isNil "_unit") exitWith {}; if (isNull _unit) exitWith {}; if (_unit == player) exitWith {hint localize "STR_ANOTF_Error";}; diff --git a/Altis_Life.Altis/core/admin/fn_adminGetID.sqf b/Altis_Life.Altis/core/admin/fn_adminGetID.sqf index c9b0d5e9f..3c84c1e43 100644 --- a/Altis_Life.Altis/core/admin/fn_adminGetID.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminGetID.sqf @@ -8,7 +8,7 @@ https://community.bistudio.com/wiki/Multiplayer_Server_Commands */ private _unit = lbData[2902,lbCurSel (2902)]; -_unit = parseSimpleArray format ["%1", _unit]; +_unit = call compile format ["%1", _unit]; if (isNil "_unit") exitWith {}; if (isNull _unit) exitWith {}; diff --git a/Altis_Life.Altis/core/admin/fn_adminQuery.sqf b/Altis_Life.Altis/core/admin/fn_adminQuery.sqf index ffb512108..a3bef64e8 100644 --- a/Altis_Life.Altis/core/admin/fn_adminQuery.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminQuery.sqf @@ -11,7 +11,7 @@ disableSerialization; if (!isNil "admin_query_ip") exitWith {hint localize "STR_ANOTF_Query_2"}; _text = CONTROL(2900,2903); _info = lbData[2902,lbCurSel (2902)]; -_info = parseSimpleArray format ["%1", _info]; +_info = call compile format ["%1", _info]; if (isNil "_info") exitWith {_text ctrlSetText localize "STR_ANOTF_QueryFail";}; if (isNull _info) exitWith {_text ctrlSetText localize "STR_ANOTF_QueryFail";}; diff --git a/Altis_Life.Altis/core/admin/fn_adminSpectate.sqf b/Altis_Life.Altis/core/admin/fn_adminSpectate.sqf index de35528b9..a15ff2cf9 100644 --- a/Altis_Life.Altis/core/admin/fn_adminSpectate.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminSpectate.sqf @@ -9,7 +9,7 @@ if (FETCH_CONST(life_adminlevel) < 3) exitWith {closeDialog 0;}; private _unit = lbData[2902,lbCurSel (2902)]; -_unit = parseSimpleArray format ["%1", _unit]; +_unit = call compile format ["%1", _unit]; if (isNil "_unit") exitWith {}; if (isNull _unit) exitWith {}; if (_unit == player) exitWith {hint localize "STR_ANOTF_Error";}; diff --git a/Altis_Life.Altis/core/admin/fn_adminTpHere.sqf b/Altis_Life.Altis/core/admin/fn_adminTpHere.sqf index 98c1cdab1..7bf0f9872 100644 --- a/Altis_Life.Altis/core/admin/fn_adminTpHere.sqf +++ b/Altis_Life.Altis/core/admin/fn_adminTpHere.sqf @@ -9,7 +9,7 @@ if (FETCH_CONST(life_adminlevel) < 4) exitWith {closeDialog 0;}; private _target = lbData[2902,lbCurSel (2902)]; -_target = parseSimpleArray format ["%1", _target]; +_target = call compile format ["%1", _target]; if (isNil "_target" || isNull _target) exitWith {}; if (_target == player) exitWith {hint localize "STR_ANOTF_Error";}; diff --git a/Altis_Life.Altis/core/cop/fn_wantedGrab.sqf b/Altis_Life.Altis/core/cop/fn_wantedGrab.sqf index 2cd9d55e9..deaa3587c 100644 --- a/Altis_Life.Altis/core/cop/fn_wantedGrab.sqf +++ b/Altis_Life.Altis/core/cop/fn_wantedGrab.sqf @@ -11,7 +11,7 @@ disableSerialization; _display = findDisplay 2400; _tab = _display displayCtrl 2402; _criminal = lbData[2401,(lbCurSel 2401)]; -_criminal = parseSimpleArray format ["%1", _criminal]; +_criminal = call compile format ["%1", _criminal]; if (isNil "_criminal") exitWith {}; if (life_HC_isActive) then { diff --git a/Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf b/Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf index 0ec95fb50..a4578e57d 100644 --- a/Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf +++ b/Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf @@ -10,7 +10,7 @@ private "_unit"; disableSerialization; if ((lbCurSel 2632) isEqualTo -1) exitWith {hint localize "STR_GNOTF_SelectPerson"}; -_unit = parseSimpleArray format ["%1",CONTROL_DATA(2632)]; +_unit = call compile format ["%1",CONTROL_DATA(2632)]; if (isNull _unit) exitWith {}; //Bad unit? if (_unit == player) exitWith {hint localize "STR_GNOTF_InviteSelf"}; diff --git a/Altis_Life.Altis/core/gangs/fn_gangKick.sqf b/Altis_Life.Altis/core/gangs/fn_gangKick.sqf index 569455a75..63ef0b7a1 100644 --- a/Altis_Life.Altis/core/gangs/fn_gangKick.sqf +++ b/Altis_Life.Altis/core/gangs/fn_gangKick.sqf @@ -10,7 +10,7 @@ private ["_unit","_unitID","_members"]; disableSerialization; if ((lbCurSel 2621) isEqualTo -1) exitWith {hint localize "STR_GNOTF_SelectKick"}; -_unit = parseSimpleArray format ["%1",CONTROL_DATA(2621)]; +_unit = call compile format ["%1",CONTROL_DATA(2621)]; if (isNull _unit) exitWith {}; //Bad unit? if (_unit == player) exitWith {hint localize "STR_GNOTF_KickSelf"}; diff --git a/Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf b/Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf index 4652e28c0..d484cd744 100644 --- a/Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf +++ b/Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf @@ -10,7 +10,7 @@ private ["_unit","_unitID","_members","_action","_index"]; disableSerialization; if ((lbCurSel 2621) isEqualTo -1) exitWith {hint localize "STR_GNOTF_TransferSelect"}; -_unit = parseSimpleArray format ["%1",CONTROL_DATA(2621)]; +_unit = call compile format ["%1",CONTROL_DATA(2621)]; if (isNull _unit) exitWith {}; //Bad unit? if (_unit == player) exitWith {hint localize "STR_GNOTF_TransferSelf"}; diff --git a/Altis_Life.Altis/core/housing/fn_initHouses.sqf b/Altis_Life.Altis/core/housing/fn_initHouses.sqf index e341b633c..4ce0d34f9 100644 --- a/Altis_Life.Altis/core/housing/fn_initHouses.sqf +++ b/Altis_Life.Altis/core/housing/fn_initHouses.sqf @@ -8,7 +8,7 @@ if (life_houses isEqualTo []) exitWith {}; //Nothing to do. { - _position = parseSimpleArray format ["%1",_x select 0]; + _position = call compile format ["%1",_x select 0]; _house = nearestObject [_position, "House"]; _house setVariable ["uid",round(random 99999),true]; _houseName = getText(configFile >> "CfgVehicles" >> (typeOf _house) >> "displayName"); diff --git a/Altis_Life.Altis/core/pmenu/fn_giveItem.sqf b/Altis_Life.Altis/core/pmenu/fn_giveItem.sqf index dcbb09bfe..3b5746677 100644 --- a/Altis_Life.Altis/core/pmenu/fn_giveItem.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_giveItem.sqf @@ -25,7 +25,7 @@ call { private _unit = lbData [2023, lbCurSel 2023]; - _unit = parseSimpleArray format ["%1",_unit]; + _unit = call compile format ["%1",_unit]; if (isNil "_unit") exitWith { hint localize "STR_NOTF_notWithinRange"; diff --git a/Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf b/Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf index aaff1fb6e..5e5fce9ab 100644 --- a/Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf @@ -11,7 +11,7 @@ _amount = ctrlText 2018; ctrlShow[2001,false]; if ((lbCurSel 2022) isEqualTo -1) exitWith {hint localize "STR_NOTF_noOneSelected";ctrlShow[2001,true];}; _unit = lbData [2022,lbCurSel 2022]; -_unit = parseSimpleArray format ["%1",_unit]; +_unit = call compile format ["%1",_unit]; if (isNil "_unit") exitWith {ctrlShow[2001,true];}; if (_unit == player) exitWith {ctrlShow[2001,true];}; if (isNull _unit) exitWith {ctrlShow[2001,true];}; diff --git a/Altis_Life.Altis/core/pmenu/fn_keyGive.sqf b/Altis_Life.Altis/core/pmenu/fn_keyGive.sqf index 0d8940b83..599a24b5c 100644 --- a/Altis_Life.Altis/core/pmenu/fn_keyGive.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_keyGive.sqf @@ -22,7 +22,7 @@ _vehicle = life_vehicles select parseNumber(_vehicle); if ((lbCurSel 2702) isEqualTo -1) exitWith {hint localize "STR_NOTF_didNotSelectPlayer";}; _sel = lbCurSel _plist; _unit = _plist lbData _sel; -_unit = parseSimpleArray format ["%1", _unit]; +_unit = call compile format ["%1", _unit]; if (isNull _unit || isNil "_unit") exitWith {}; if (_unit == player) exitWith {}; diff --git a/Altis_Life.Altis/core/pmenu/fn_pardon.sqf b/Altis_Life.Altis/core/pmenu/fn_pardon.sqf index 94b22cde6..7d1ef1346 100644 --- a/Altis_Life.Altis/core/pmenu/fn_pardon.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_pardon.sqf @@ -13,7 +13,7 @@ if !(playerSide isEqualTo west) exitWith {}; _display = findDisplay 2400; _list = _display displayCtrl 2402; _data = lbData[2401,(lbCurSel 2401)]; -_data = parseSimpleArray format ["%1", _data]; +_data = call compile format ["%1", _data]; if (isNil "_data") exitWith {}; if (!(_data isEqualType [])) exitWith {}; if (_data isEqualTo []) exitWith {}; diff --git a/Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf b/Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf index 562056392..ff3e0e68c 100644 --- a/Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf +++ b/Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf @@ -10,7 +10,7 @@ if !(playerSide isEqualTo west) exitWith {hint localize "STR_Cop_wantedList_notC if ((lbCurSel 2406) isEqualTo -1) exitWith {hint localize "STR_Cop_wantedList_noPlayerSelected";}; if ((lbCurSel 2407) isEqualTo -1) exitWith {hint localize "STR_Cop_wantedList_noCrimeSelected";}; private _unit = lbData [2406,lbCurSel 2406]; -_unit = parseSimpleArray format ["%1",_unit]; +_unit = call compile format ["%1",_unit]; private _amount = lbData [2407,lbCurSel 2407]; if (isNil "_unit") exitWith {}; if (isNull _unit) exitWith {}; diff --git a/Altis_Life.Altis/core/session/fn_requestReceived.sqf b/Altis_Life.Altis/core/session/fn_requestReceived.sqf index 04c652032..8a349d3c0 100755 --- a/Altis_Life.Altis/core/session/fn_requestReceived.sqf +++ b/Altis_Life.Altis/core/session/fn_requestReceived.sqf @@ -82,7 +82,7 @@ switch (playerSide) do { }; { - _house = nearestObject [(parseSimpleArray format ["%1",(_x select 0)]), "House"]; + _house = nearestObject [(call compile format ["%1",(_x select 0)]), "House"]; life_vehicles pushBack _house; } forEach life_houses; diff --git a/Altis_Life.Altis/core/shops/fn_levelCheck.sqf b/Altis_Life.Altis/core/shops/fn_levelCheck.sqf index 6c613c65f..9121037a2 100644 --- a/Altis_Life.Altis/core/shops/fn_levelCheck.sqf +++ b/Altis_Life.Altis/core/shops/fn_levelCheck.sqf @@ -25,7 +25,7 @@ if (_itemConfig isEqualType []) then { if (_itemConfig isEqualTo "") exitWith {true}; -private _evaluation = parseSimpleArray _itemConfig; +private _evaluation = call compile _itemConfig; if (_evaluation isEqualType true) then { if (_evaluation) then { diff --git a/Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf b/Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf index 45f9d532f..ceed20547 100644 --- a/Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf +++ b/Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf @@ -8,7 +8,7 @@ */ private ["_value","_unit","_tax"]; _value = parseNumber(ctrlText 2702); -_unit = parseSimpleArray format ["%1",(lbData[2703,(lbCurSel 2703)])]; +_unit = call compile format ["%1",(lbData[2703,(lbCurSel 2703)])]; if (isNull _unit) exitWith {}; if ((lbCurSel 2703) isEqualTo -1) exitWith {hint localize "STR_ATM_NoneSelected"}; if (isNil "_unit") exitWith {hint localize "STR_ATM_DoesntExist"}; diff --git a/Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf b/Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf index 09d403600..21927009c 100644 --- a/Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf +++ b/Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf @@ -13,7 +13,7 @@ _index = _this select 1; //Fetch some information. _dataArr = CONTROL_DATAI(_control,_index); -_dataArr = parseSimpleArray format ["%1",_dataArr]; +_dataArr = call compile format ["%1",_dataArr]; _className = (_dataArr select 0); _classNameLife = _className; diff --git a/Altis_Life.Altis/dialog/function/fn_sellGarage.sqf b/Altis_Life.Altis/dialog/function/fn_sellGarage.sqf index c2b31af4d..c078be048 100644 --- a/Altis_Life.Altis/dialog/function/fn_sellGarage.sqf +++ b/Altis_Life.Altis/dialog/function/fn_sellGarage.sqf @@ -10,7 +10,7 @@ private ["_vehicle","_vehicleLife","_vid","_pid","_sellPrice","_multiplier","_pr disableSerialization; if ((lbCurSel 2802) isEqualTo -1) exitWith {hint localize "STR_Global_NoSelection"}; _vehicle = lbData[2802,(lbCurSel 2802)]; -_vehicle = (parseSimpleArray format ["%1",_vehicle]) select 0; +_vehicle = (call compile format ["%1",_vehicle]) select 0; _vehicleLife = _vehicle; _vid = lbValue[2802,(lbCurSel 2802)]; _pid = getPlayerUID player; diff --git a/Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf b/Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf index 249881bde..603f50fcb 100644 --- a/Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf +++ b/Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf @@ -14,10 +14,10 @@ if (life_spawn_point isEqualTo []) then { _sp = _spCfg select 0; if (playerSide isEqualTo civilian) then { - if (isNil {(parseSimpleArray format ["%1",_sp select 0])}) then { + if (isNil {(call compile format ["%1",_sp select 0])}) then { player setPos (getMarkerPos (_sp select 0)); } else { - _spawnPos = selectRandom (parseSimpleArray format ["%1",_sp select 0]); + _spawnPos = selectRandom (call compile format ["%1",_sp select 0]); _spawnPos = _spawnPos buildingPos 0; player setPos _spawnPos; }; @@ -27,7 +27,7 @@ if (life_spawn_point isEqualTo []) then { titleText[format ["%2 %1",_sp select 1,localize "STR_Spawn_Spawned"],"BLACK IN"]; } else { if (playerSide isEqualTo civilian) then { - if (isNil {(parseSimpleArray format ["%1",life_spawn_point select 0])}) then { + if (isNil {(call compile format ["%1",life_spawn_point select 0])}) then { if (((life_spawn_point select 0) find "house") != -1) then { private ["_bPos","_house","_pos"]; @@ -45,7 +45,7 @@ if (life_spawn_point isEqualTo []) then { player setPos (getMarkerPos (life_spawn_point select 0)); }; } else { - _spawnPos = selectRandom (parseSimpleArray format ["%1", life_spawn_point select 0]); + _spawnPos = selectRandom (call compile format ["%1", life_spawn_point select 0]); _spawnPos = _spawnPos buildingPos 0; player setPos _spawnPos; }; diff --git a/Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf b/Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf index dfc5b7ba0..ed4199505 100644 --- a/Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf +++ b/Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf @@ -41,7 +41,7 @@ for "_i" from 0 to count(_spawnCfg)-1 do { if (playerSide isEqualTo civilian) then { if (count life_houses > 0) then { { - _pos = parseSimpleArray format ["%1",(_x select 0)]; + _pos = call compile format ["%1",(_x select 0)]; _house = nearestObject [_pos, "House"]; _houseName = getText(configFile >> "CfgVehicles" >> (typeOf _house) >> "displayName"); _return pushBack [format ["house_%1",_house getVariable "uid"],_houseName,"\a3\ui_f\data\map\MapControl\lighthouse_ca.paa"]; diff --git a/Altis_Life.Altis/dialog/function/fn_unimpound.sqf b/Altis_Life.Altis/dialog/function/fn_unimpound.sqf index a43ebf1a3..9e13093e4 100644 --- a/Altis_Life.Altis/dialog/function/fn_unimpound.sqf +++ b/Altis_Life.Altis/dialog/function/fn_unimpound.sqf @@ -10,7 +10,7 @@ private ["_vehicle","_vehicleLife","_vid","_pid","_unit","_price","_price","_sto disableSerialization; if ((lbCurSel 2802) isEqualTo -1) exitWith {hint localize "STR_Global_NoSelection"}; _vehicle = lbData[2802,(lbCurSel 2802)]; -_vehicle = (parseSimpleArray format ["%1",_vehicle]) select 0; +_vehicle = (call compile format ["%1",_vehicle]) select 0; _vehicleLife = _vehicle; _vid = lbValue[2802,(lbCurSel 2802)]; _pid = getPlayerUID player; diff --git a/life_hc/MySQL/General/fn_asyncCall.sqf b/life_hc/MySQL/General/fn_asyncCall.sqf index 9f4c6f6d5..ed56be932 100644 --- a/life_hc/MySQL/General/fn_asyncCall.sqf +++ b/life_hc/MySQL/General/fn_asyncCall.sqf @@ -20,7 +20,7 @@ _key = EXTDB format ["%1:%2:%3",_mode,FETCH_CONST(life_sql_id),_queryStmt]; if (_mode isEqualTo 1) exitWith {true}; -_key = parseSimpleArray format ["%1",_key]; +_key = call compile format ["%1",_key]; _key = (_key select 1); _queryResult = EXTDB format ["4:%1", _key]; diff --git a/life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf b/life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf index 07363a139..368060a29 100755 --- a/life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf +++ b/life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf @@ -22,13 +22,13 @@ private _containers = [_query, 2, true] call HC_fnc_asyncCall; private _containerss = []; { - _position = parseSimpleArray format ["%1",_x select 1]; + _position = call compile format ["%1",_x select 1]; _house = nearestObject [_position, "House"]; - _direction = parseSimpleArray format ["%1",_x select 5]; + _direction = call compile format ["%1",_x select 5]; _trunk = _x select 3; - if (_trunk isEqualType "") then {_trunk = parseSimpleArray format ["%1", _trunk];}; + if (_trunk isEqualType "") then {_trunk = call compile format ["%1", _trunk];}; _gear = _x select 4; - if (_gear isEqualType "") then {_gear = parseSimpleArray format ["%1", _gear];}; + if (_gear isEqualType "") then {_gear = call compile format ["%1", _gear];}; _container = createVehicle[_x select 2,[0,0,999],[],0,"NONE"]; waitUntil {!isNil "_container" && {!isNull _container}}; _containerss = _house getVariable ["containers",[]]; @@ -79,7 +79,7 @@ private _houses = [_query, 2, true] call HC_fnc_asyncCall; _return = []; { - _pos = parseSimpleArray format ["%1",_x select 1]; + _pos = call compile format ["%1",_x select 1]; _house = nearestObject [_pos, "House"]; _house allowDamage false; _return pushBack [_x select 1]; diff --git a/life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf b/life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf index cb5ed5415..5e99e944d 100755 --- a/life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf +++ b/life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf @@ -43,7 +43,7 @@ if !(_queryResult isEqualTo []) then { _queryResult = [_query,2] call HC_fnc_asyncCall; _pastCrimes = _queryResult select 0; - if (_pastCrimes isEqualType "") then {_pastCrimes = parseSimpleArray format ["%1", _pastCrimes];}; + if (_pastCrimes isEqualType "") then {_pastCrimes = call compile format ["%1", _pastCrimes];}; _pastCrimes pushBack _number; _query = format ["updateWanted:%1:%2:%3", _pastCrimes, _val, _uid]; [_query,1] call HC_fnc_asyncCall; diff --git a/life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf b/life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf index 8d1a7c02e..562c904af 100755 --- a/life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf +++ b/life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf @@ -22,7 +22,7 @@ private _query = format ["selectWantedActive:%1", _criminal select 0]; private _queryResult = [_query, 2] call HC_fnc_asyncCall; private _type = _queryResult select 0; -if (_type isEqualType "") then {_type = parseSimpleArray format ["%1", _type];}; +if (_type isEqualType "") then {_type = call compile format ["%1", _type];}; private _crimesArr = []; { diff --git a/life_server/Functions/Housing/fn_fetchPlayerHouses.sqf b/life_server/Functions/Housing/fn_fetchPlayerHouses.sqf index d1cec8019..38bfd9b11 100755 --- a/life_server/Functions/Housing/fn_fetchPlayerHouses.sqf +++ b/life_server/Functions/Housing/fn_fetchPlayerHouses.sqf @@ -20,13 +20,13 @@ private _containers = [_query, 2, true] call DB_fnc_asyncCall; private _containerss = []; { - _position = parseSimpleArray format ["%1",_x select 1]; + _position = call compile format ["%1",_x select 1]; _house = nearestObject [_position, "House"]; - _direction = parseSimpleArray format ["%1",_x select 5]; + _direction = call compile format ["%1",_x select 5]; _trunk = _x select 3; - if (_trunk isEqualType "") then {_trunk = parseSimpleArray format ["%1", _trunk];}; + if (_trunk isEqualType "") then {_trunk = call compile format ["%1", _trunk];}; _gear = _x select 4; - if (_gear isEqualType "") then {_gear = parseSimpleArray format ["%1", _gear];}; + if (_gear isEqualType "") then {_gear = call compile format ["%1", _gear];}; _container = createVehicle[_x select 2,[0,0,999],[],0,"NONE"]; waitUntil {!isNil "_container" && {!isNull _container}}; _containerss = _house getVariable ["containers",[]]; @@ -77,7 +77,7 @@ private _houses = [_query, 2, true] call DB_fnc_asyncCall; _return = []; { - _pos = parseSimpleArray format ["%1",_x select 1]; + _pos = call compile format ["%1",_x select 1]; _house = nearestObject [_pos, "House"]; _house allowDamage false; _return pushBack [_x select 1]; diff --git a/life_server/Functions/Housing/fn_initHouses.sqf b/life_server/Functions/Housing/fn_initHouses.sqf index cf082871e..61278a7af 100755 --- a/life_server/Functions/Housing/fn_initHouses.sqf +++ b/life_server/Functions/Housing/fn_initHouses.sqf @@ -11,7 +11,7 @@ for [{_x=0},{_x<=_count},{_x=_x+10}] do { private _queryResult = [_query, 2, true] call DB_fnc_asyncCall; if (_queryResult isEqualTo []) exitWith {}; { - _pos = parseSimpleArray format ["%1", _x select 2]; + _pos = call compile format ["%1", _x select 2]; _house = nearestObject [_pos, "House"]; _house setVariable ["house_owner",[_x select 1, _x select 3],true]; _house setVariable ["house_id", _x select 0, true]; diff --git a/life_server/Functions/MySQL/fn_asyncCall.sqf b/life_server/Functions/MySQL/fn_asyncCall.sqf index 23783980d..46665335c 100755 --- a/life_server/Functions/MySQL/fn_asyncCall.sqf +++ b/life_server/Functions/MySQL/fn_asyncCall.sqf @@ -22,7 +22,7 @@ private _key = EXTDB format ["%1:%2:%3",_mode,FETCH_CONST(life_sql_id),_queryStm if (_mode isEqualTo 1) exitWith {true}; -_key = parseSimpleArray format ["%1",_key]; +_key = call compile format ["%1",_key]; _key = _key select 1; private _queryResult = EXTDB format ["4:%1", _key]; diff --git a/life_server/Functions/WantedSystem/fn_wantedAdd.sqf b/life_server/Functions/WantedSystem/fn_wantedAdd.sqf index 637093cf9..000efff8d 100755 --- a/life_server/Functions/WantedSystem/fn_wantedAdd.sqf +++ b/life_server/Functions/WantedSystem/fn_wantedAdd.sqf @@ -41,7 +41,7 @@ if !(_queryResult isEqualTo []) then { _queryResult = [_query,2] call DB_fnc_asyncCall; _pastCrimes = _queryResult select 0; - if (_pastCrimes isEqualType "") then {_pastCrimes = parseSimpleArray format ["%1", _pastCrimes];}; + if (_pastCrimes isEqualType "") then {_pastCrimes = call compile format ["%1", _pastCrimes];}; _pastCrimes pushBack _number; _query = format ["updateWanted:%1:%2:%3", _pastCrimes, _val, _uid]; [_query,1] call DB_fnc_asyncCall; diff --git a/life_server/Functions/WantedSystem/fn_wantedCrimes.sqf b/life_server/Functions/WantedSystem/fn_wantedCrimes.sqf index a228f366e..dfdceec55 100755 --- a/life_server/Functions/WantedSystem/fn_wantedCrimes.sqf +++ b/life_server/Functions/WantedSystem/fn_wantedCrimes.sqf @@ -22,7 +22,7 @@ private _queryResult = [_query, 2] call DB_fnc_asyncCall; _ret = owner _ret; private _type = _queryResult select 0; -if (_type isEqualType "") then {_type = parseSimpleArray format ["%1", _type];}; +if (_type isEqualType "") then {_type = call compile format ["%1", _type];}; private _crimesArr = []; { diff --git a/life_server/functions.sqf b/life_server/functions.sqf index 15ea30068..d7e1b1f74 100644 --- a/life_server/functions.sqf +++ b/life_server/functions.sqf @@ -151,7 +151,7 @@ compileFinal " if (_length > 400) exitWith {hint localize ""STR_CELLMSG_LIMITEXCEEDED"";ctrlShow[3015,true];}; if (lbCurSel 3004 isEqualTo -1) exitWith {hint localize ""STR_CELLMSG_SelectPerson""; ctrlShow[3015,true];}; - _to = parseSimpleArray format [""%1"",(lbData[3004,(lbCurSel 3004)])]; + _to = call compile format [""%1"",(lbData[3004,(lbCurSel 3004)])]; if (isNull _to) exitWith {ctrlShow[3015,true];}; if (isNil ""_to"") exitWith {ctrlShow[3015,true];}; if (_msg isEqualTo """") exitWith {hint localize ""STR_CELLMSG_EnterMSG"";ctrlShow[3015,true];}; @@ -203,7 +203,7 @@ compileFinal " private [""_msg"",""_to""]; ctrlShow[3020,false]; _msg = ctrlText 3003; - _to = parseSimpleArray format [""%1"",(lbData[3004,(lbCurSel 3004)])]; + _to = call compile format [""%1"",(lbData[3004,(lbCurSel 3004)])]; if (isNull _to) exitWith {ctrlShow[3020,true];}; if (isNil ""_to"") exitWith {ctrlShow[3020,true];}; if (_msg isEqualTo """") exitWith {hint localize ""STR_CELLMSG_EnterMSG"";ctrlShow[3020,true];};