From f9b2890f3ad934e390a8892f0df97fb06cf5c295 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Thu, 6 Feb 2014 15:03:35 -0600 Subject: [PATCH] change over to use static vars add player name to logging --- SQF/dayz_code/compile/player_unlockVault.sqf | 6 ++-- SQF/dayz_server/init/server_functions.sqf | 33 ++++++-------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index 0fe993102..f32ee770f 100644 --- a/SQF/dayz_code/compile/player_unlockVault.sqf +++ b/SQF/dayz_code/compile/player_unlockVault.sqf @@ -65,10 +65,12 @@ if ((_ownerID == dayz_combination) or (_ownerID == dayz_playerUID)) then { [player,"tentpack",0,false] call dayz_zombieSpeak; sleep 5; - PVDZE_obj_getlocalVars = [player, _obj, ["WeaponCargo", "MagazineCargo", "BackpackCargo"]]; - publicVariableServer "PVDZE_obj_getlocalVars"; + PVDZE_obj_getlocalVars = [player, _obj]; PVDZE_localVarsResult = nil; + + publicVariableServer "PVDZE_obj_getlocalVars"; + waitUntil {sleep 1; !isNil "PVDZE_localVarsResult"}; _weapons = if (typeName (PVDZE_localVarsResult select 0) == "ARRAY") then { (PVDZE_localVarsResult select 0) } else { [] }; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index a0b65b69a..420505baf 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -911,21 +911,14 @@ server_getLocalObjVars = { _objectID = _obj getVariable["ObjectID","0"]; _objectUID = _obj getVariable["ObjectUID","0"]; - _vars = _this select 2; - - if (typeName _vars != "ARRAY") then { - _vars = [_vars]; - }; + _weapons = _obj getVariable ["WeaponCargo", false]; + _magazines = _obj getVariable ["MagazineCargo", false]; + _backpacks = _obj getVariable ["BackpackCargo", false]; - _vals = []; - { - _vals = _vals + [_obj getVariable [_x, false]]; - } forEach _vars; - - PVDZE_localVarsResult = _vals; + PVDZE_localVarsResult = [_weapons,_magazines,_backpacks]; (owner _player) publicVariableClient "PVDZE_localVarsResult"; - diag_log format["SAFE UNLOCKED: ID:%1 UID:%2 BY %3", _objectID, _objectUID, (getPlayerUID _player)]; + diag_log format["SAFE UNLOCKED: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), (getPlayerUID _player)]; }; server_setLocalObjVars = { @@ -943,16 +936,10 @@ server_setLocalObjVars = { _backpacks = getBackpackCargo _obj; deleteVehicle _obj; - - if (count _weapons > 0) then { - _holder setVariable ["WeaponCargo", _weapons]; - }; - if (count _magazines > 0) then { - _holder setVariable ["MagazineCargo", _magazines]; - }; - if (count _backpacks > 0) then { - _holder setVariable ["BackpackCargo", _backpacks]; - }; - diag_log format["SAFE LOCKED: ID:%1 UID:%2 BY %3", _objectID, _objectUID, (getPlayerUID _player)]; + _holder setVariable ["WeaponCargo", _weapons]; + _holder setVariable ["MagazineCargo", _magazines]; + _holder setVariable ["BackpackCargo", _backpacks]; + + diag_log format["SAFE LOCKED: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), (getPlayerUID _player)]; }; \ No newline at end of file