Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13468 from AriDEV/6.x

Browse Source 
Server/Entities: Updated Item Container Sub Class & Bag Family Mask For ...
This commit is contained in:
Duarte Duarte
2014-10-27 20:02:00 +00:00
parent 8fc9ae7426 c220f3d830
commit efd2607cce
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Item/Item.cpp
View File

@@ -218,6 +218,10 @@ bool ItemCanGoIntoBag(ItemTemplate const* pProto, ItemTemplate const* pBagProto)
if (!(pProto->BagFamily & BAG_FAMILY_MASK_FISHING_SUPP))
return false;
return true;
case ITEM_SUBCLASS_COOKING_CONTAINER:
if (!(pProto->BagFamily & BAG_FAMILY_MASK_COOKING_SUPP))
return false;
return true;
default:
return false;
}

6
src/server/game/Entities/Item/ItemPrototype.h
View File

@@ -246,6 +246,7 @@ enum BAG_FAMILY_MASK
BAG_FAMILY_MASK_CURRENCY_TOKENS = 0x00002000,
BAG_FAMILY_MASK_QUEST_ITEMS = 0x00004000,
BAG_FAMILY_MASK_FISHING_SUPP = 0x00008000,
BAG_FAMILY_MASK_COOKING_SUPP = 0x00010000,
};
enum SocketColor
@@ -344,10 +345,11 @@ enum ItemSubclassContainer
ITEM_SUBCLASS_MINING_CONTAINER = 6,
ITEM_SUBCLASS_LEATHERWORKING_CONTAINER = 7,
ITEM_SUBCLASS_INSCRIPTION_CONTAINER = 8,
ITEM_SUBCLASS_TACKLE_CONTAINER = 9
ITEM_SUBCLASS_TACKLE_CONTAINER = 9,
ITEM_SUBCLASS_COOKING_CONTAINER = 10
};
#define MAX_ITEM_SUBCLASS_CONTAINER 10
#define MAX_ITEM_SUBCLASS_CONTAINER 11
enum ItemSubclassWeapon
{