From 59c731ba70a4db50dc6d0f4afd4b16a6477d7da2 Mon Sep 17 00:00:00 2001 From: Bruce Date: Sat, 30 Apr 2016 00:59:17 +0200 Subject: [PATCH] Added ZSCdefines. Checking plotfriends against dayz_playerUID. --- SQF/dayz_code/actions/player_buildingDowngrade.sqf | 2 +- SQF/dayz_code/actions/player_upgrade.sqf | 2 +- SQF/dayz_code/compile/dze_buildChecks.sqf | 2 +- SQF/dayz_code/compile/fn_selfActions.sqf | 4 ++-- SQF/dayz_code/config.cpp | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf index e030755ed..c1e3e0b21 100644 --- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf +++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf @@ -52,7 +52,7 @@ if(_IsNearPlot == 0) then { _fuid = _fuid + [_friendUID]; } forEach _friendlies; // check if friendly to owner - if(dayz_characterID in _fuid) then { + if(dayz_playerUID in _fuid) then { _canBuildOnPlot = true; }; } else { diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf index 26164cf3a..5e4f5fef4 100644 --- a/SQF/dayz_code/actions/player_upgrade.sqf +++ b/SQF/dayz_code/actions/player_upgrade.sqf @@ -53,7 +53,7 @@ if(_IsNearPlot == 0) then { _fuid = _fuid + [_friendUID]; } forEach _friendlies; // check if friendly to owner - if(dayz_characterID in _fuid) then { + if(dayz_playerUID in _fuid) then { _canBuildOnPlot = true; }; } else { diff --git a/SQF/dayz_code/compile/dze_buildChecks.sqf b/SQF/dayz_code/compile/dze_buildChecks.sqf index c61f56b21..c91127d14 100644 --- a/SQF/dayz_code/compile/dze_buildChecks.sqf +++ b/SQF/dayz_code/compile/dze_buildChecks.sqf @@ -52,7 +52,7 @@ if(_IsNearPlot == 0) then { } forEach _friendlies; _builder = getPlayerUID player; // check if friendly to owner - if(dayz_characterID in _fuid) then { + if(dayz_playerUID in _fuid) then { _canBuild = true; }; } else { diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 7aa38e38e..2dd9344db 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -454,7 +454,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur }; }; // plotManagement // - if(_isModularDoor) then { + if(_isModularDoor && DZE_plotManagement) then { if(_hasToolbox && "ItemCrowbar" in _itemsPlayer) then { _findNearestPoles = nearestObjects[player, ["Plastic_Pole_EP1_DZ"], DZE_PlotPole select 0]; _IsNearPlot = count (_findNearestPoles); @@ -689,7 +689,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur // plotManagement // // add Scroll-Menu to Plotpole - if (DZE_plotManagement && (s_player_plotManagement < 0) ) then { + if( DZE_plotManagement && (s_player_plotManagement < 0) ) then { _adminList = ["0152"]; //TODO: Add admins here if you admins to able to manage all plotpoles _owner = if(DZE_plotforLife) then { _cursorTarget getVariable ["ownerPUID","0"] } diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index ad9ecb3f1..addaed267 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -114,5 +114,6 @@ class CfgAddons #include "Configs\CfgExtra\snappoints.hpp" #include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.hpp" // plotManagement // +#include "Configs\RscDisplay\ZSCdefines.hpp" #include "Configs\RscDisplay\plotManagement.hpp" // plotManagement //