summaryrefslogtreecommitdiff
path: root/src/server/game/Handlers
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/Handlers
parentf6eefedcd537754978cc351ec8a78a7f67dd7979 (diff)
Removing multi-vendor Rochet2 patchv0.50.5
It caused compilation errors too
Diffstat (limited to 'src/server/game/Handlers')
-rw-r--r--src/server/game/Handlers/ItemHandler.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index 153ae31079..50fcd7f025 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -724,7 +724,7 @@ void WorldSession::HandleListInventoryOpcode(WorldPacket & recvData)
SendListInventory(guid);
}
-void WorldSession::SendListInventory(uint64 vendorGuid, uint32 vendorEntry)
+void WorldSession::SendListInventory(uint64 vendorGuid)
{
;//sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_LIST_INVENTORY");
@@ -744,9 +744,7 @@ void WorldSession::SendListInventory(uint64 vendorGuid, uint32 vendorEntry)
if (vendor->HasUnitState(UNIT_STATE_MOVING))
vendor->StopMoving();
- SetCurrentVendor(vendorEntry);
-
- VendorItemData const* items = vendorEntry ? sObjectMgr->GetNpcVendorItemList(vendorEntry) : vendor->GetVendorItems();
+ VendorItemData const* items = vendor->GetVendorItems();
if (!items)
{
WorldPacket data(SMSG_LIST_INVENTORY, 8 + 1 + 1);