W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename FNC_check_owner --> FNC_check_owner_friends

Browse Source 
Use a more descriptive name for what it actually does now.
This commit is contained in:
ebaydayz
2016-06-12 13:30:49 -04:00
parent 835d750c0c
commit 20066de673
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/actions/A_Plot_for_Life/plot_take_ownership.sqf
View File

@@ -15,7 +15,7 @@ _changecount = 0;
// Check is owner of the plot pole. // Check is owner of the plot pole.
_isowner = [player, _plotpole] call FNC_check_owner; _isowner = [player, _plotpole] call FNC_check_owner_friends;
_itemsExist = false; _itemsExist = false;
if ((_isowner select 0 )) then { if ((_isowner select 0 )) then {
@@ -25,7 +25,7 @@ if ((_isowner select 0 )) then {
_classname = typeOf _object; _classname = typeOf _object;
if (_classname in DZE_plotTakeOwnershipItems)then { 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"; diag_log text "Plot Take Ownership: Object in DZE_plotTakeOwnershipItems";
if !( _isowner select 0 ) then{ if !( _isowner select 0 ) then{

2
SQF/dayz_code/actions/player_buildingDowngrade.sqf
View File

@@ -27,7 +27,7 @@ if(_IsNearPlot == 0) then {
_canBuildOnPlot = true; _canBuildOnPlot = true;
} else { } else {
if (DZE_permanentPlot) then { if (DZE_permanentPlot) then {
_buildcheck = [player, _nearestPole] call FNC_check_owner; _buildcheck = [player, _nearestPole] call FNC_check_owner_friends;
_isowner = _buildcheck select 0; _isowner = _buildcheck select 0;
_isfriendly = _buildcheck select 1; _isfriendly = _buildcheck select 1;
if (_isowner || _isfriendly) then { if (_isowner || _isfriendly) then {

2
SQF/dayz_code/actions/player_upgrade.sqf
View File

@@ -26,7 +26,7 @@ if(_IsNearPlot == 0) then {
_canBuildOnPlot = true; _canBuildOnPlot = true;
} else { } else {
if (DZE_permanentPlot) then { if (DZE_permanentPlot) then {
_buildcheck = [player, _nearestPole] call FNC_check_owner; _buildcheck = [player, _nearestPole] call FNC_check_owner_friends;
_isowner = _buildcheck select 0; _isowner = _buildcheck select 0;
_isfriendly = _buildcheck select 1; _isfriendly = _buildcheck select 1;
if (_isowner || _isfriendly) then { if (_isowner || _isfriendly) then {

2
SQF/dayz_code/actions/remove.sqf
View File

@@ -60,7 +60,7 @@ _nearestPole = _plotcheck select 2;
if(_IsNearPlot >= 1) then { if(_IsNearPlot >= 1) then {
// Since there are plot poles nearby we need to check ownership && friend status // 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; _isowner = _buildcheck select 0;
_isfriendly = _buildcheck select 1; _isfriendly = _buildcheck select 1;
if (!_isowner && !_isfriendly) then { if (!_isowner && !_isfriendly) then {

0
SQF/dayz_code/compile/A_Plot_for_Life/fn_check_owner.sqf → SQF/dayz_code/compile/A_Plot_for_Life/fn_check_owner_friends.sqf
View File

2
SQF/dayz_code/compile/dze_buildChecks.sqf
View File

@@ -42,7 +42,7 @@ if(_IsNearPlot == 0) then {
_canBuild = true; _canBuild = true;
} else { } else {
if (DZE_permanentPlot) then { if (DZE_permanentPlot) then {
_buildcheck = [player, _nearestPole] call FNC_check_owner; _buildcheck = [player, _nearestPole] call FNC_check_owner_friends;
_isowner = _buildcheck select 0; _isowner = _buildcheck select 0;
_isfriendly = _buildcheck select 1; _isfriendly = _buildcheck select 1;
if (_isowner || _isfriendly) then { if (_isowner || _isfriendly) then {

2
SQF/dayz_code/compile/fn_damageActions.sqf
View File

@@ -215,7 +215,7 @@ if (isPlayer cursorTarget) then {
if (DZE_permanentPlot) then { if (DZE_permanentPlot) then {
_charID = [_unit] call FNC_GetPlayerUID; _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 { if !(_charID in _friendlies) then {
r_action = true; r_action = true;
_action = _unit addAction ["Tag as friendly", "\z\addons\dayz_code\actions\player_tagFriendly.sqf", [], 0, false, true]; _action = _unit addAction ["Tag as friendly", "\z\addons\dayz_code\actions\player_tagFriendly.sqf", [], 0, false, true];

6
SQF/dayz_code/compile/fn_selfActions.sqf
View File

@@ -420,7 +420,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
if(_isModular || _isModularDoor || {_typeOfCursorTarget in DZE_isDestroyableStorage}) then { if(_isModular || _isModularDoor || {_typeOfCursorTarget in DZE_isDestroyableStorage}) then {
if(_hasToolbox && "ItemCrowbar" in _itemsPlayer) 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 { If ((_isowner select 0) || (_isowner select 1)) then {
_player_deleteBuild = true; _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 ((_cursorTarget isKindOf "Plastic_Pole_EP1_DZ") && {_canDo && speed player <= 1}) then {
if (DZE_permanentPlot) then { if (DZE_permanentPlot) then {
if (s_player_plotManagement < 0) 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 { 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]; 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 (DZE_permanentPlot) then {
if (s_player_plot_take_ownership < 0) then { if (s_player_plot_take_ownership < 0) then {
if (DZE_PlotOwnership) 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 { 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]; 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];
}; };

8
SQF/dayz_code/init/compiles.sqf
View File

@@ -91,10 +91,10 @@ if (!isDedicated) then {
} else { } else {
player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build.sqf"; 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";
DZE_build_vector_file = "\z\addons\dayz_code\compile\BuildVectors\build_vectors.sqf"; //Vector building build_vectors = compile preprocessFileLineNumbers DZE_build_vector_file;
build_vectors = compile preprocessFileLineNumbers DZE_build_vector_file; //Vector building fnc_SetPitchBankYaw = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\BuildVectors\fnc_SetPitchBankYaw.sqf";
FNC_check_owner = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\A_Plot_for_Life\fn_check_owner.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"; 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"; player_buildVanilla = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildVanilla.sqf";