fixes and cleanup

This commit is contained in:
[VB]AWOL
2013-11-25 08:49:42 -06:00
parent 9e37dee845
commit 974362664f
5 changed files with 47 additions and 73 deletions

View File

@@ -1,7 +1,11 @@
private ["_holder","_type","_classname","_name","_actionSet"];
_holder = _this select 0;
_type = _this select 1;
_classname = _this select 2;
// Exit if player zombie
if(player isKindOf "PZombie_VB") exitWith {};
_name = getText (configFile >> _type >> _classname >> "displayName");
_actionSet = _holder getVariable["actionSet", false];
@@ -10,5 +14,4 @@ if (!_actionSet) then {
s_player_holderPickup = _holder addAction [format[(localize "STR_DAYZ_CODE_1"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
player reveal _holder;
_holder setVariable["actionSet", true];
};

View File

@@ -1,7 +1,7 @@
private["_holder","_type","_classname","_name"];
private["_holder","_type","_classname","_name","_null"];
_holder = _this select 0;
_type = _this select 1;
_classname = _this select 2;
_name = getText (configFile >> _type >> _classname >> "displayName");
null = _holder addAction [format[(localize "STR_DAYZ_CODE_1"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
_null = _holder addAction [format[(localize "STR_DAYZ_CODE_1"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
player reveal _holder;

View File

@@ -9,7 +9,7 @@ _name = getText (configFile >> _type >> _classname >> "displayName");
if(player isKindOf "PZombie_VB") exitWith {};
actionMonitor = {
private["_holder","_type","_classname","_name","_action","_distance","_run","_timeout"];
private ["_holder","_type","_classname","_name","_action","_distance","_run","_timeout","_null"];
_holder = _this select 0;
_type = _this select 1;
_classname = _this select 2;
@@ -37,7 +37,7 @@ actionMonitor = {
};
// Stop the loop and fall back to old code
if (_distance > 100) then {
null = _holder addAction [format[(localize "STR_DAYZ_CODE_1"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
_null = _holder addAction [format[(localize "STR_DAYZ_CODE_1"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
player reveal _holder;
_run = false;
_timeout = 0;