From b0afc402e2716558b17f59957b319a2844357164 Mon Sep 17 00:00:00 2001 From: icomrade Date: Thu, 28 Apr 2016 18:59:50 -0400 Subject: [PATCH] Require Config Traders for Advanced Trading Since advanced trading can now handle vehicles I don't think there's any point to have the old dialog if using advanced trading. --- SQF/dayz_code/compile/fn_selfActions.sqf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 42677de80..e6aee91c3 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -934,13 +934,14 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur _buy = player addAction [format["Trade %1 %2 for %3 %4",(_x select 3),(_x select 5),(_x select 2),(_x select 6)], "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",[(_x select 0),(_x select 1),(_x select 2),(_x select 3),(_x select 4),(_x select 5),(_x select 6)], (_x select 7), true, true]; s_player_parts set [count s_player_parts,_buy]; } count (_traderMenu select 1); - if (DZE_advancedTrading) then { + if (DZE_advancedTrading && DZE_ConfigTrader) then { _buyV = player addAction ["Advanced Trading", "\z\addons\dayz_code\actions\AdvancedTrading\init.sqf",(_traderMenu select 0), 999, true, false, "",""]; s_player_parts set [count s_player_parts,_buyV]; + } else { + // Database menu + _buy = player addAction [localize "STR_EPOCH_PLAYER_289", "\z\addons\dayz_code\actions\show_dialog.sqf",(_traderMenu select 0), 999, true, false]; + s_player_parts set [count s_player_parts,_buy]; }; - // Database menu - _buy = player addAction [localize "STR_EPOCH_PLAYER_289", "\z\addons\dayz_code\actions\show_dialog.sqf",(_traderMenu select 0), 999, true, false]; - s_player_parts set [count s_player_parts,_buy]; }; s_player_parts_crtl = 1; };