Merge pull request #925 from dayz10k/master

#924 tweak remove tanktrap/camonet
This commit is contained in:
HARLAN
2013-12-16 11:28:47 -08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -3,7 +3,7 @@ private ["_nearNets","_nearNet"];
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder); _canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder);
_nearNets = nearestObjects [player, ["DesertLargeCamoNet","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ"], 10]; _nearNets = nearestObjects [player, ["DesertLargeCamoNet","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ"], 3];
_nearNet = _nearNets select 0; _nearNet = _nearNets select 0;
if (!isNull _nearNet and _canDo) then { if (!isNull _nearNet and _canDo) then {

View File

@@ -3,7 +3,7 @@ private ["_nearTankTraps","_nearTankTrap"];
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder); _canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder);
_nearTankTraps = nearestObjects [player, "Hedgehog_DZ", 1]; _nearTankTraps = nearestObjects [player, ["Hedgehog_DZ"], 1];
_nearTankTrap = _nearTankTraps select 0; _nearTankTrap = _nearTankTraps select 0;
if (!isNull _nearTankTrap and _canDo) then { if (!isNull _nearTankTrap and _canDo) then {