From 3a616674921763c5cf3f3409dbd1fe06251ec9c2 Mon Sep 17 00:00:00 2001 From: click Date: Sat, 1 May 2010 08:10:14 +0200 Subject: Add support for sorting vendor itemlists --HG-- branch : trunk --- src/game/GameEventMgr.cpp | 2 +- src/game/ObjectMgr.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 965651ae2f6..c285376ffd3 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -823,7 +823,7 @@ void GameEventMgr::LoadFromDB() sLog.outString("Loading Game Event Vendor Additions Data..."); // 0 1 2 3 4 5 - result = WorldDatabase.Query("SELECT event, guid, item, maxcount, incrtime, ExtendedCost FROM game_event_npc_vendor"); + result = WorldDatabase.Query("SELECT event, guid, item, maxcount, incrtime, ExtendedCost FROM game_event_npc_vendor ORDER BY guid, slot ASC"); count = 0; if (!result) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 94d735f10f0..54ed69417dc 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -8252,7 +8252,7 @@ void ObjectMgr::LoadTrainerSpell() int ObjectMgr::LoadReferenceVendor(int32 vendor, int32 item, std::set *skip_vendors) { // find all items from the reference vendor - QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT item, maxcount, incrtime, ExtendedCost FROM npc_vendor WHERE entry='%d'", item); + QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT item, maxcount, incrtime, ExtendedCost FROM npc_vendor WHERE entry='%d' ORDER BY slot ASC", item); if (!result) { barGoLink bar(1); @@ -8303,7 +8303,7 @@ void ObjectMgr::LoadVendors() std::set skip_vendors; - QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry, item, maxcount, incrtime, ExtendedCost FROM npc_vendor"); + QueryResult_AutoPtr result = WorldDatabase.Query("SELECT entry, item, maxcount, incrtime, ExtendedCost FROM npc_vendor ORDER BY entry, slot ASC"); if (!result) { barGoLink bar(1); -- cgit v1.2.3