Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Update to Mangos 6963.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2008-12-28 12:10:31 -06:00
parent 3bbf8d6be8
commit e2ee47fb35
21 changed files with 2042 additions and 2351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/ObjectMgr.cpp
View File

@@ -1987,7 +1987,8 @@ void ObjectMgr::LoadItemPrototypes()
void ObjectMgr::LoadAuctionItems()
{
QueryResult *result = CharacterDatabase.Query( "SELECT itemguid,item_template FROM auctionhouse" );
// data needs to be at first place for Item::LoadFromDB
QueryResult *result = CharacterDatabase.Query( "SELECT data,itemguid,item_template FROM auctionhouse JOIN item_instance ON itemguid = guid" );
if( !result )
return;
@@ -2002,8 +2003,8 @@ void ObjectMgr::LoadAuctionItems()
bar.step();
fields = result->Fetch();
uint32 item_guid = fields[0].GetUInt32();
uint32 item_template = fields[1].GetUInt32();
uint32 item_guid = fields[1].GetUInt32();
uint32 item_template = fields[2].GetUInt32();
ItemPrototype const *proto = GetItemPrototype(item_template);
@@ -2015,7 +2016,7 @@ void ObjectMgr::LoadAuctionItems()
Item *item = NewItemOrBag(proto);
if(!item->LoadFromDB(item_guid,0))
if(!item->LoadFromDB(item_guid,0, result))
{
delete item;
continue;