diff options
| author | Yehonal <hw.2@hotmail.it> | 2016-06-26 19:22:35 +0200 |
|---|---|---|
| committer | Yehonal <hw.2@hotmail.it> | 2016-06-26 19:22:35 +0200 |
| commit | 52f305111ce2bb876eaea985d75ffcb744f583a5 (patch) | |
| tree | 6607d6eb3af13384f3cf5e6aafd362f244da49ea /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 5bb70a86beab67958520b170c5008b82d0e36314 (diff) | |
importing changes from callmephil repo
a special thanks to him
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index fe466c7f28..4104bf80b1 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8540,8 +8540,9 @@ bool ObjectMgr::RemoveVendorItem(uint32 entry, uint32 item, bool persist /*= tru return true; } -bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, Player* player, std::set<uint32>* skip_vendors, uint32 ORnpcflag) const +bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 maxcount, uint32 incrtime, uint32 ExtendedCost, Player* player, std::set<uint32>* /*skip_vendors*/, uint32 /*ORnpcflag*/) const { + /* CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(vendor_entry); if (!cInfo) { @@ -8566,6 +8567,7 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max } return false; } + */ if (!sObjectMgr->GetItemTemplate(item_id)) { |