diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/AuctionHouseMgr.cpp | 5 | ||||
| -rw-r--r-- | 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 97126abddb2..717deead4bd 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/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)) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 62fdbce7bde..5399b44cb68 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__ |