W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix fn_waitForObject handling multiple of same object type

Browse Source 
Forgot to handle case where there is already one or more of that object
type in the area (safes, cars, etc.).
This commit is contained in:
ebaydayz
2016-08-22 20:13:39 -04:00
parent a70501cf59
commit 38b2a551bd
12 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/compile/player_lockVault.sqf
View File

@@ -3,7 +3,7 @@
Usage: [_obj] spawn player_unlockVault;
Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
*/
private ["_obj","_ownerID","_alreadyPacking","_text","_playerNear","_ComboMatch","_objType"];
private ["_obj","_ownerID","_alreadyPacking","_text","_playerNear","_ComboMatch","_objType","_near"];
if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_10" call dayz_rollingMessages;};
DZE_ActionInProgress = true;
@@ -41,14 +41,16 @@ if (!isNull _obj) then {
disableUserInput true; // Make sure player can not modify gear while it is being saved
(findDisplay 106) closeDisplay 0; // Close gear
dze_waiting = nil;
_near = nearestObjects [player,[_lockedClass],50];
[_lockedClass,objNull,_near] spawn fn_waitForObject;
PVDZE_handleSafeGear = [player,_obj,1];
publicVariableServer "PVDZE_handleSafeGear";
//wait for response from server to verify safe was logged and saved before proceeding
waitUntil {!isNil "dze_waiting"};
disableUserInput false; // Safe is done saving now
[_lockedClass,objNull] spawn fn_waitForObject;
format[localize "str_epoch_player_117",_text] call dayz_rollingMessages;
};
s_player_lockvault = -1;