Make plot and door friends lists backwards compatible

This prevents errors when upgrading 1051 databases that had plot or door
management installed.

See comments at:

fe9b8fdcb4
This commit is contained in:
ebaydayz
2016-09-19 20:21:27 -04:00
parent b9ec6df95e
commit ac95c6b0df
3 changed files with 10 additions and 8 deletions

View File

@@ -1,7 +1,8 @@
private "_friends"; private ["_friends","_name"];
lbClear 7102; lbClear 7102;
_friends = TheDoor getVariable ["doorfriends",[]]; _friends = TheDoor getVariable ["doorfriends",[]];
{ {
lbAdd [7102, toString (_x select 1)]; _name = _x select 1;
lbAdd [7102, if (typeName _name == "ARRAY") then {toString _name} else {_name}];
} forEach _friends; } forEach _friends;

View File

@@ -1,9 +1,10 @@
private ["_plots","_friendlies","_thePlot"]; private ["_name","_plots","_friendlies","_thePlot"];
lbClear 7002; lbClear 7002;
_plots = nearestObjects [[player] call FNC_getPos, ["Plastic_Pole_EP1_DZ"],15]; _plots = nearestObjects [[player] call FNC_getPos, ["Plastic_Pole_EP1_DZ"],15];
_thePlot = _plots select 0; _thePlot = _plots select 0;
_friendlies = _thePlot getVariable ["plotfriends", []]; _friendlies = _thePlot getVariable ["plotfriends", []];
{ {
lbAdd [7002, toString (_x select 1)]; _name = _x select 1;
lbAdd [7002, if (typeName _name == "ARRAY") then {toString _name} else {_name}];
} forEach _friendlies; } forEach _friendlies;

View File

@@ -71,17 +71,17 @@ _object_inventory = {
} else { } else {
_isNormal = true; _isNormal = true;
if( DZE_permanentPlot && (typeOf (_object) == "Plastic_Pole_EP1_DZ") ) then { if (DZE_permanentPlot && (typeOf (_object) == "Plastic_Pole_EP1_DZ")) then {
_isNormal = false; _isNormal = false;
_inventory = _object getVariable ["plotfriends", []]; //We're replacing the inventory with UIDs for this item _inventory = _object getVariable ["plotfriends", []]; //We're replacing the inventory with UIDs for this item
}; };
if( DZE_doorManagement && (typeOf (_object) in DZE_DoorsLocked) ) then { if (DZE_doorManagement && (typeOf (_object) in DZE_DoorsLocked)) then {
_isNormal = false; _isNormal = false;
_inventory = _object getVariable ["doorfriends", []]; //We're replacing the inventory with UIDs for this item _inventory = _object getVariable ["doorfriends", []]; //We're replacing the inventory with UIDs for this item
}; };
if(_isNormal) then { if (_isNormal) then {
_inventory = [getWeaponCargo _object, getMagazineCargo _object, getBackpackCargo _object]; _inventory = [getWeaponCargo _object, getMagazineCargo _object, getBackpackCargo _object];
}; };
}; };