From d46eb13267641e8e2c08fa277f507fb1b5ed6e3b Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sun, 17 Apr 2016 22:51:10 -0400 Subject: [PATCH] Fix redirect to vanilla player_craftItem --- SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp | 3 +++ SQF/dayz_code/actions/player_craftItem.sqf | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp b/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp index 25b6d7a98..c93ba025c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp @@ -6,6 +6,9 @@ class SkinBase : CA_Magazine model = "\dayz_equip\models\cloth_parcel.p3d"; picture = "\dayz_equip\textures\equip_cloth_parcel_ca.paa"; + displayName = $STR_EQUIP_NAME_CLOTHES; // Used in Epoch player_craftItem for canvas + descriptionShort = $STR_EQUIP_DESC_CLOTHES; + Craftoutput = "equip_rag"; class ItemActions diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf index 327e053a8..c1f3fc4d9 100644 --- a/SQF/dayz_code/actions/player_craftItem.sqf +++ b/SQF/dayz_code/actions/player_craftItem.sqf @@ -1,5 +1,5 @@ -// If no parameters were passed redirect to vanilla player_craftItem (Epoch items always pass an array) -if ((isNil "_this") or {(typeName _this == "ARRAY") && {count _this < 1}}) exitWith {[] spawn player_craftItemVanilla;}; +// If a string was passed redirect to vanilla player_craftItem (Epoch items always pass an array) +if (typeName _this == "STRING") exitWith {_this spawn player_craftItemVanilla;}; /* DayZ Epoch Crafting 0.3