From 01d7801ca0d12662bbcb19f7c7f5ebecf780197c Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Fri, 27 Feb 2009 06:44:11 +0300 Subject: [PATCH] [7346] Revert [7342] and really restore work CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION setting. --- src/game/AuctionHouseMgr.cpp | 5 ++++- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp index 24fac0a3a..b5370c19b 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/src/game/AuctionHouseMgr.cpp @@ -49,6 +49,9 @@ AuctionHouseMgr::~AuctionHouseMgr() AuctionHouseObject * AuctionHouseMgr::GetAuctionsMap( uint32 factionTemplateId ) { + if(sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION)) + return &mNeutralAuctions; + // team have linked auction houses FactionTemplateEntry const* u_entry = sFactionTemplateStore.LookupEntry(factionTemplateId); if(!u_entry) @@ -456,7 +459,7 @@ void AuctionHouseMgr::Update() AuctionHouseEntry const* AuctionHouseMgr::GetAuctionHouseEntry(uint32 factionTemplateId) { - uint32 houseid = 7; // goblin auction house + uint32 houseid = 1; // dwarf auction house (used for normal cut/etc percents) if(!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION)) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 62fdbce7b..5399b44cb 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7345" + #define REVISION_NR "7346" #endif // __REVISION_NR_H__