summaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authoryehonal <yehonal.azeroth@gmail.com>2016-06-27 00:19:46 +0200
committeryehonal <yehonal.azeroth@gmail.com>2016-06-27 00:19:46 +0200
commitbf139c3d34c09eeabafe8f22ca64a670e203c075 (patch)
treeee9d3cc3c8731ed9601427ef9c4cb5bd769bcf03 /src/server/game/Globals/ObjectMgr.cpp
parentf6eefedcd537754978cc351ec8a78a7f67dd7979 (diff)
Removing multi-vendor Rochet2 patchv0.50.5
It caused compilation errors too
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 544edecae3..e0a5e0944d 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -8540,9 +8540,8 @@ 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)
{
@@ -8567,7 +8566,6 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max
}
return false;
}
- */
if (!sObjectMgr->GetItemTemplate(item_id))
{