pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-13 10:58:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into char_to_string

Browse Source 
Conflicts:
	common/dbcore.h
This commit is contained in:
Arthur Ice
2013-05-25 21:30:21 -07:00
parent 1b9004445d 52b8c0e078
commit a372ba3d39
55 changed files with 576 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/Item.h
+7
View File
@@ -195,7 +195,11 @@ public:
// Test whether a given slot can support a container item
static bool SupportsContainers(int16 slot_id);
void dumpEntireInventory();
void dumpWornItems();
void dumpInventory();
void dumpBankItems();
void dumpSharedBankItems();
void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value);
void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value);
@@ -207,6 +211,9 @@ protected:
// Protected Methods
///////////////////////////////
void dumpItemCollection(const std::map<int16, ItemInst*> &collection);
void dumpBagContents(ItemInst *inst, iter_inst *it);
// Retrieves item within an inventory bucket
ItemInst* _GetItem(const std::map<int16, ItemInst*>& bucket, int16 slot_id) const;