From 91f168011cf4e2613d60788c3e8574cedd83ec18 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sun, 2 Oct 2016 14:11:20 -0400 Subject: [PATCH] Remove unused variable from #1770 _inventoryMoney was unused @oiad --- .../AdvancedTrading/functions/z_at_returnChange.sqf | 7 +++---- SQF/dayz_code/compile/epoch_returnChange.sqf | 7 +++---- SQF/dayz_code/stringtable.xml | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_returnChange.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_returnChange.sqf index 1726ae384..2a7b13dc0 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_returnChange.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_returnChange.sqf @@ -24,12 +24,11 @@ Z_ChangeOverflow = false; if (_combine) then { _trade_total = 0; _total_currency = 0; - _inventoryMoney = []; _combineOk = 1; { - _part = (configFile >> "CfgMagazines" >> _x); - _worth = (_part >> "worth"); - if isNumber (_worth) then { + _part = configFile >> "CfgMagazines" >> _x; + _worth = (_part >> "worth"); + if (isNumber _worth) then { _combineOk = [player,_part,1] call BIS_fnc_invRemove; _total_currency = _total_currency + getNumber(_worth); } else { diff --git a/SQF/dayz_code/compile/epoch_returnChange.sqf b/SQF/dayz_code/compile/epoch_returnChange.sqf index b901a9af0..b5b548fe3 100644 --- a/SQF/dayz_code/compile/epoch_returnChange.sqf +++ b/SQF/dayz_code/compile/epoch_returnChange.sqf @@ -36,14 +36,13 @@ if (_canAfford) then { // total currency _total_currency = 0; { - _part = (configFile >> "CfgMagazines" >> _x); - _worth = (_part >> "worth"); - if isNumber (_worth) then { + _part = configFile >> "CfgMagazines" >> _x; + _worth = (_part >> "worth"); + if (isNumber _worth) then { if (([player,_part,1] call BIS_fnc_invRemove) == 1) then { _total_currency = _total_currency + getNumber(_worth); }; }; - } count (magazines player); //diag_log format["DEBUG TRADER INPUT CURRENCY TOTAL: %1", _total_currency]; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index cd16c14da..114b8e603 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -2737,7 +2737,6 @@ M9 Silenciada M9 Silencieux M9 s tlumičem - M9 SD Blueprint to create a M9SD. Required - 1 M9, 1 Attachment_Silencer. - ToolBox