Skip to content

Parse simple array #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Parse simple array #641

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29f440a
call compile > parseSimpleArray
that-edward Mar 25, 2020
dc71cd9
Merge branch 'master' into parseSimpleArray
that-edward Mar 30, 2020
c4e28fe
Tried and cried
that-edward Mar 30, 2020
95f73a2
Merge branch 'master' into parseSimpleArray
that-edward Jun 1, 2020
e2ab4de
Merge branch 'master' into parseSimpleArray
that-edward Jun 1, 2020
0a4b3fb
Merge branch 'master' into parseSimpleArray
that-edward Jun 6, 2020
888b1fa
Merge branch 'master' into parseSimpleArray
that-edward Jun 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/actions/fn_getDPMission.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Copy link
Member

@DomT602 DomT602 Mar 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've gotta be careful, not every call compile can become parseSimpleArray. In this instance, there is no array, as once compiled its an object.

Copy link
Contributor

@blackfisch blackfisch Mar 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that could become missionNamespace getVariable _dp tho :)

or maybe missionNamespace getVariable [_dp, objNull] with isNull check to be safe

_dp = toUpper((_dp splitString "_") joinString " ");

life_cur_task = player createSimpleTask [format ["Delivery_%1",life_dp_point]];
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/admin/fn_adminFreeze.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Copy link
Member

@DomT602 DomT602 Mar 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again here

Copy link
Contributor

@blackfisch blackfisch Mar 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't touch these, I want to do them in a seperate pr (already prepared that one)

if (isNil "_unit") exitWith {};
if (isNull _unit) exitWith {};
if (_unit == player) exitWith {hint localize "STR_ANOTF_Error";};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/admin/fn_adminGetID.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Copy link
Member

@DomT602 DomT602 Mar 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here

if (isNil "_unit") exitWith {};
if (isNull _unit) exitWith {};

Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/admin/fn_adminQuery.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/admin/fn_adminSpectate.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/admin/fn_adminTpHere.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";};

Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/cop/fn_wantedGrab.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/gangs/fn_gangInvitePlayer.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/gangs/fn_gangKick.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/gangs/fn_gangNewLeader.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/housing/fn_initHouses.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/pmenu/fn_giveItem.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/pmenu/fn_giveMoney.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/pmenu/fn_keyGive.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};

Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/pmenu/fn_pardon.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/pmenu/fn_wantedAddP.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/session/fn_requestReceived.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/shops/fn_levelCheck.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/function/fn_bankTransfer.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/function/fn_sellGarage.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand All @@ -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"];
Expand All @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/function/fn_spawnPointCfg.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/dialog/function/fn_unimpound.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions life_hc/MySQL/General/fn_asyncCall.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand All @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions life_hc/MySQL/Housing/fn_fetchPlayerHouses.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",[]];
Expand Down Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion life_hc/MySQL/WantedSystem/fn_wantedAdd.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion life_hc/MySQL/WantedSystem/fn_wantedCrimes.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
{
Expand Down
10 changes: 5 additions & 5 deletions life_server/Functions/Housing/fn_fetchPlayerHouses.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",[]];
Expand Down Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion life_server/Functions/Housing/fn_initHouses.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions life_server/Functions/MySQL/fn_asyncCall.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion life_server/Functions/WantedSystem/fn_wantedAdd.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion life_server/Functions/WantedSystem/fn_wantedCrimes.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
{
Expand Down
4 changes: 2 additions & 2 deletions life_server/functions.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];};
Expand Down Expand Up @@ -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];};
Expand Down