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

change over to use static vars add player name to logging

Browse Source
This commit is contained in:
[VB]AWOL
2014-02-06 15:03:35 -06:00
parent 6ebbd143e5
commit f9b2890f3a
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,10 +65,12 @@ if ((_ownerID == dayz_combination) or (_ownerID == dayz_playerUID)) then {
[player,"tentpack",0,false] call dayz_zombieSpeak; [player,"tentpack",0,false] call dayz_zombieSpeak;
sleep 5; sleep 5;
PVDZE_obj_getlocalVars = [player, _obj, ["WeaponCargo", "MagazineCargo", "BackpackCargo"]]; PVDZE_obj_getlocalVars = [player, _obj];
publicVariableServer "PVDZE_obj_getlocalVars";
PVDZE_localVarsResult = nil; PVDZE_localVarsResult = nil;
publicVariableServer "PVDZE_obj_getlocalVars";
waitUntil {sleep 1; !isNil "PVDZE_localVarsResult"}; waitUntil {sleep 1; !isNil "PVDZE_localVarsResult"};
_weapons = if (typeName (PVDZE_localVarsResult select 0) == "ARRAY") then { (PVDZE_localVarsResult select 0) } else { [] }; _weapons = if (typeName (PVDZE_localVarsResult select 0) == "ARRAY") then { (PVDZE_localVarsResult select 0) } else { [] };

25
SQF/dayz_server/init/server_functions.sqf
View File

@@ -911,21 +911,14 @@ server_getLocalObjVars = {
_objectID = _obj getVariable["ObjectID","0"]; _objectID = _obj getVariable["ObjectID","0"];
_objectUID = _obj getVariable["ObjectUID","0"]; _objectUID = _obj getVariable["ObjectUID","0"];
_vars = _this select 2; _weapons = _obj getVariable ["WeaponCargo", false];
_magazines = _obj getVariable ["MagazineCargo", false];
_backpacks = _obj getVariable ["BackpackCargo", false];
if (typeName _vars != "ARRAY") then { PVDZE_localVarsResult = [_weapons,_magazines,_backpacks];
_vars = [_vars];
};
_vals = [];
{
_vals = _vals + [_obj getVariable [_x, false]];
} forEach _vars;
PVDZE_localVarsResult = _vals;
(owner _player) publicVariableClient "PVDZE_localVarsResult"; (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 = { server_setLocalObjVars = {
@@ -944,15 +937,9 @@ server_setLocalObjVars = {
deleteVehicle _obj; deleteVehicle _obj;
if (count _weapons > 0) then {
_holder setVariable ["WeaponCargo", _weapons]; _holder setVariable ["WeaponCargo", _weapons];
};
if (count _magazines > 0) then {
_holder setVariable ["MagazineCargo", _magazines]; _holder setVariable ["MagazineCargo", _magazines];
};
if (count _backpacks > 0) then {
_holder setVariable ["BackpackCargo", _backpacks]; _holder setVariable ["BackpackCargo", _backpacks];
};
diag_log format["SAFE LOCKED: ID:%1 UID:%2 BY %3", _objectID, _objectUID, (getPlayerUID _player)]; diag_log format["SAFE LOCKED: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), (getPlayerUID _player)];
}; };