[7346] Revert [7342] and really restore work CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION setting. Author: VladimirMangos

--HG--
branch : trunk

src/game/AuctionHouseMgr.cpp

@@ -59,6 +59,9 @@ AuctionHouseObject * AuctionHouseMgr::GetAuctionsMapByLocation( AuctionLocation
 
 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)
@@ -466,7 +469,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))
     {

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__