diff --git a/SQF/dayz_code/actions/A_Plot_for_Life/plot_take_ownership.sqf b/SQF/dayz_code/actions/A_Plot_for_Life/plot_take_ownership.sqf index c9874b031..95db3a5e8 100644 --- a/SQF/dayz_code/actions/A_Plot_for_Life/plot_take_ownership.sqf +++ b/SQF/dayz_code/actions/A_Plot_for_Life/plot_take_ownership.sqf @@ -15,7 +15,7 @@ _changecount = 0; // Check is owner of the plot pole. -_isowner = [player, _plotpole] call FNC_check_owner; +_isowner = [player, _plotpole] call FNC_check_owner_friends; _itemsExist = false; if ((_isowner select 0 )) then { @@ -25,7 +25,7 @@ if ((_isowner select 0 )) then { _classname = typeOf _object; if (_classname in DZE_plotTakeOwnershipItems)then { - _isowner = [player, _object] call FNC_check_owner; + _isowner = [player, _object] call FNC_check_owner_friends; diag_log text "Plot Take Ownership: Object in DZE_plotTakeOwnershipItems"; if !( _isowner select 0 ) then{ diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf index f4dd1446a..e67824ed8 100644 --- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf +++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf @@ -27,7 +27,7 @@ if(_IsNearPlot == 0) then { _canBuildOnPlot = true; } else { if (DZE_permanentPlot) then { - _buildcheck = [player, _nearestPole] call FNC_check_owner; + _buildcheck = [player, _nearestPole] call FNC_check_owner_friends; _isowner = _buildcheck select 0; _isfriendly = _buildcheck select 1; if (_isowner || _isfriendly) then { diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf index b86b49d65..4961c651d 100644 --- a/SQF/dayz_code/actions/player_upgrade.sqf +++ b/SQF/dayz_code/actions/player_upgrade.sqf @@ -26,7 +26,7 @@ if(_IsNearPlot == 0) then { _canBuildOnPlot = true; } else { if (DZE_permanentPlot) then { - _buildcheck = [player, _nearestPole] call FNC_check_owner; + _buildcheck = [player, _nearestPole] call FNC_check_owner_friends; _isowner = _buildcheck select 0; _isfriendly = _buildcheck select 1; if (_isowner || _isfriendly) then { diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index 6423a4037..31e0be51f 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -60,7 +60,7 @@ _nearestPole = _plotcheck select 2; if(_IsNearPlot >= 1) then { // Since there are plot poles nearby we need to check ownership && friend status - _buildcheck = [player, _nearestPole] call FNC_check_owner; + _buildcheck = [player, _nearestPole] call FNC_check_owner_friends; _isowner = _buildcheck select 0; _isfriendly = _buildcheck select 1; if (!_isowner && !_isfriendly) then { diff --git a/SQF/dayz_code/compile/A_Plot_for_Life/fn_check_owner.sqf b/SQF/dayz_code/compile/A_Plot_for_Life/fn_check_owner_friends.sqf similarity index 100% rename from SQF/dayz_code/compile/A_Plot_for_Life/fn_check_owner.sqf rename to SQF/dayz_code/compile/A_Plot_for_Life/fn_check_owner_friends.sqf diff --git a/SQF/dayz_code/compile/dze_buildChecks.sqf b/SQF/dayz_code/compile/dze_buildChecks.sqf index 29a46a9f9..b6ff7934b 100644 --- a/SQF/dayz_code/compile/dze_buildChecks.sqf +++ b/SQF/dayz_code/compile/dze_buildChecks.sqf @@ -42,7 +42,7 @@ if(_IsNearPlot == 0) then { _canBuild = true; } else { if (DZE_permanentPlot) then { - _buildcheck = [player, _nearestPole] call FNC_check_owner; + _buildcheck = [player, _nearestPole] call FNC_check_owner_friends; _isowner = _buildcheck select 0; _isfriendly = _buildcheck select 1; if (_isowner || _isfriendly) then { diff --git a/SQF/dayz_code/compile/fn_damageActions.sqf b/SQF/dayz_code/compile/fn_damageActions.sqf index 720c28baf..905cea48d 100644 --- a/SQF/dayz_code/compile/fn_damageActions.sqf +++ b/SQF/dayz_code/compile/fn_damageActions.sqf @@ -215,7 +215,7 @@ if (isPlayer cursorTarget) then { if (DZE_permanentPlot) then { _charID = [_unit] call FNC_GetPlayerUID; }; - _friendlies = [player, _unit] call FNC_check_owner; + _friendlies = [player, _unit] call FNC_check_owner_friends; if !(_charID in _friendlies) then { r_action = true; _action = _unit addAction ["Tag as friendly", "\z\addons\dayz_code\actions\player_tagFriendly.sqf", [], 0, false, true]; diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 82a29a82c..b0948e78b 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -420,7 +420,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur if(_isModular || _isModularDoor || {_typeOfCursorTarget in DZE_isDestroyableStorage}) then { if(_hasToolbox && "ItemCrowbar" in _itemsPlayer) then { - _isowner = [player, _cursorTarget] call FNC_check_owner; + _isowner = [player, _cursorTarget] call FNC_check_owner_friends; If ((_isowner select 0) || (_isowner select 1)) then { _player_deleteBuild = true; }; @@ -633,7 +633,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur if ((_cursorTarget isKindOf "Plastic_Pole_EP1_DZ") && {_canDo && speed player <= 1}) then { if (DZE_permanentPlot) then { if (s_player_plotManagement < 0) then { - _isowner = [player, _cursorTarget] call FNC_check_owner; + _isowner = [player, _cursorTarget] call FNC_check_owner_friends; If ((_isowner select 0) || (_isowner select 1)) then { s_player_plot_take_ownership = player addAction ["Take plot items ownership", "\z\addons\dayz_code\actions\A_Plot_for_Life\plot_take_ownership.sqf", "", 1, false]; }; @@ -660,7 +660,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur if (DZE_permanentPlot) then { if (s_player_plot_take_ownership < 0) then { if (DZE_PlotOwnership) then { - _isowner = [player, _cursorTarget] call FNC_check_owner; + _isowner = [player, _cursorTarget] call FNC_check_owner_friends; If (_isowner select 0) then { s_player_plot_take_ownership = player addAction ["Take plot items ownership", "\z\addons\dayz_code\actions\A_Plot_for_Life\plot_take_ownership.sqf", "", 1, false]; }; diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 5774262ae..4da47bb47 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -91,11 +91,11 @@ if (!isDedicated) then { } else { player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build.sqf"; }; - fnc_SetPitchBankYaw = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\BuildVectors\fnc_SetPitchBankYaw.sqf"; //Vector building - DZE_build_vector_file = "\z\addons\dayz_code\compile\BuildVectors\build_vectors.sqf"; //Vector building - build_vectors = compile preprocessFileLineNumbers DZE_build_vector_file; //Vector building - FNC_check_owner = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\A_Plot_for_Life\fn_check_owner.sqf"; - FNC_find_plots = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\A_Plot_for_Life\fn_find_plots.sqf"; + DZE_build_vector_file = "\z\addons\dayz_code\compile\BuildVectors\build_vectors.sqf"; + build_vectors = compile preprocessFileLineNumbers DZE_build_vector_file; + fnc_SetPitchBankYaw = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\BuildVectors\fnc_SetPitchBankYaw.sqf"; + FNC_check_owner_friends = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\A_Plot_for_Life\fn_check_owner_friends.sqf"; + FNC_find_plots = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\A_Plot_for_Life\fn_find_plots.sqf"; player_buildVanilla = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildVanilla.sqf"; fn_buildCamera = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildCamera.sqf";