diff options
| author | megamage <none@none> | 2009-02-27 12:25:52 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-27 12:25:52 -0600 |
| commit | 228e9b0322c1d26900db778b21561c3913940e81 (patch) | |
| tree | a423fca8234597ea9b3a4e2e7cd38857d086248d /src | |
| parent | e2fa2e44b6e30767c9d36cf9c4b128e5df40c418 (diff) | |
[7346] Revert [7342] and really restore work CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION setting. Author: VladimirMangos
--HG--
branch : trunk
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__ |