From 387075f6ae21ae33910bb67863735dc6d32cb5e2 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Tue, 11 Feb 2014 21:56:25 +0100 Subject: [PATCH] Removed obsolete code --- SQF/dayz_code/actions/player_addToolbelt.sqf | 17 ++++------------- SQF/dayz_code/actions/player_build.sqf | 1 - 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/SQF/dayz_code/actions/player_addToolbelt.sqf b/SQF/dayz_code/actions/player_addToolbelt.sqf index c79462260..1e609f3c8 100644 --- a/SQF/dayz_code/actions/player_addToolbelt.sqf +++ b/SQF/dayz_code/actions/player_addToolbelt.sqf @@ -49,7 +49,7 @@ if (_isOk) then { _display = findDisplay 106; _display closeDisplay 0; }; - + //Add magazines if needed if (_create in ["MeleeHatchet_DZE","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then { if (_create == "MeleeCrowbar") then { @@ -67,20 +67,11 @@ if (_isOk) then { if (_create == "MeleeFishingPole") then { player addMagazine 'Fishing_Swing'; }; - if (_type == "cfgWeapons") then { - _muzzles = getArray(configFile >> "cfgWeapons" >> _create >> "muzzles"); - _wtype = ((weapons player) select 0); - if (count _muzzles > 1) then { - player selectWeapon (_muzzles select 0); - } else { - player selectWeapon _wtype; - }; - }; - }; + }; } else { cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"]; - + //Add magazines back if (_item in ["MeleeHatchet_DZE","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then { if (_item == "MeleeCrowbar") then { @@ -98,6 +89,6 @@ if (_isOk) then { if (_item == "MeleeFishingPole") then { player addMagazine 'Fishing_Swing'; }; - }; + }; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index d30bdd549..7e7fac5bb 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -365,7 +365,6 @@ if (_hasrequireditem) then { // No building in trader zones if(!canbuild) then { _cancel = true; _reason = "Cannot build in a city."; }; - if(!placevault) then { _cancel = true; _reason = "Cannot build in a city."; }; if(!_cancel) then {