W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix buyItems error from #1716 @oiad

Browse Source
This commit is contained in:
ebaydayz
2016-07-30 12:28:33 -04:00
parent fbffd8e9cb
commit cc129cf403
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf
View File

@@ -104,8 +104,8 @@ if (Z_SingleCurrency) then {
_enoughMoney = _moneyInfo select 0; _enoughMoney = _moneyInfo select 0;
}; };
if (Z_SellingFrom == 0 && _backpacksToBuy >= 1) exitWith { systemChat localize "STR_EPOCH_TRADE_BAG_BAGS"; }; //backpack if (Z_SellingFrom == 0 && _backpacksToBuy > 0) exitWith { systemChat localize "STR_EPOCH_TRADE_BAG_BAGS"; }; //backpack
if (Z_SellingFrom == 2 && !isNull _backpack) exitWith { systemChat localize "STR_EPOCH_TRADE_HAVE_BACKPACK"; }; //gear if (Z_SellingFrom == 2 && !isNull _backpack && _backpacksToBuy > 0) exitWith { systemChat localize "STR_EPOCH_TRADE_HAVE_BACKPACK"; }; //gear
if (_enoughMoney) then { if (_enoughMoney) then {
if (_canBuy) then { if (_canBuy) then {

12
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf
View File

@@ -23,7 +23,7 @@ call Z_calcPrice;
if (Z_Selling) then { if (Z_Selling) then {
switch (_lbIndex) do { switch (_lbIndex) do {
case 0: { case 0: { //backpack
if (!isNull _backpack) then { if (!isNull _backpack) then {
[localize "STR_EPOCH_TRADE_SELLING_BACKPACK"] call Z_filleTradeTitle; [localize "STR_EPOCH_TRADE_SELLING_BACKPACK"] call Z_filleTradeTitle;
Z_SellingFrom = 0; Z_SellingFrom = 0;
@@ -33,7 +33,7 @@ if (Z_Selling) then {
ctrlSetText [Z_AT_SLOTSDISPLAY, " "]; ctrlSetText [Z_AT_SLOTSDISPLAY, " "];
}; };
}; };
case 1: { case 1: { //vehicle
_canBuyInVehicle = true call Z_checkCloseVehicle; _canBuyInVehicle = true call Z_checkCloseVehicle;
if (_canBuyInVehicle) then { if (_canBuyInVehicle) then {
[localize "STR_EPOCH_TRADE_SELLING_VEHICLE"] call Z_filleTradeTitle; [localize "STR_EPOCH_TRADE_SELLING_VEHICLE"] call Z_filleTradeTitle;
@@ -44,7 +44,7 @@ if (Z_Selling) then {
ctrlSetText [Z_AT_SLOTSDISPLAY, " "]; ctrlSetText [Z_AT_SLOTSDISPLAY, " "];
}; };
}; };
case 2: { case 2: { //gear
[localize "STR_EPOCH_TRADE_SELLING_GEAR"] call Z_filleTradeTitle; [localize "STR_EPOCH_TRADE_SELLING_GEAR"] call Z_filleTradeTitle;
Z_SellingFrom = 2; Z_SellingFrom = 2;
call Z_getGearItems; call Z_getGearItems;
@@ -54,7 +54,7 @@ if (Z_Selling) then {
ctrlSetText [Z_AT_TRADERLINE2, " "]; ctrlSetText [Z_AT_TRADERLINE2, " "];
ctrlSetText [Z_AT_TRADERLINE1, localize "STR_EPOCH_TRADE_SELLING_ALL"]; ctrlSetText [Z_AT_TRADERLINE1, localize "STR_EPOCH_TRADE_SELLING_ALL"];
switch (_lbIndex) do { switch (_lbIndex) do {
case 0: { case 0: { //backpack
if (!isNull _backpack) then { if (!isNull _backpack) then {
Z_SellingFrom = 0; Z_SellingFrom = 0;
[localize "STR_EPOCH_TRADE_BUYING_BACKPACK"] call Z_filleTradeTitle; [localize "STR_EPOCH_TRADE_BUYING_BACKPACK"] call Z_filleTradeTitle;
@@ -64,7 +64,7 @@ if (Z_Selling) then {
ctrlSetText [Z_AT_SLOTSDISPLAY, " "]; ctrlSetText [Z_AT_SLOTSDISPLAY, " "];
}; };
}; };
case 1: { case 1: { //vehicle
_canBuyInVehicle = true call Z_checkCloseVehicle; _canBuyInVehicle = true call Z_checkCloseVehicle;
if (_canBuyInVehicle) then { if (_canBuyInVehicle) then {
Z_SellingFrom = 1; Z_SellingFrom = 1;
@@ -75,7 +75,7 @@ if (Z_Selling) then {
ctrlSetText [Z_AT_SLOTSDISPLAY, " "]; ctrlSetText [Z_AT_SLOTSDISPLAY, " "];
}; };
}; };
case 2: { case 2: { //gear
Z_SellingFrom = 2; Z_SellingFrom = 2;
[localize "STR_EPOCH_TRADE_BUYING_GEAR"] call Z_filleTradeTitle; [localize "STR_EPOCH_TRADE_BUYING_GEAR"] call Z_filleTradeTitle;
[2] call Z_calculateFreeSpace; [2] call Z_calculateFreeSpace;