diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-09-12 20:26:46 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-09-12 20:26:46 +0200 |
| commit | 7f2cdfd166d99efdd308f0b4d195a6b972092dd9 (patch) | |
| tree | 8871e168077155d8daabca787b223940f8774af9 /src/server/game/AuctionHouseBot | |
| parent | be8111b0a21308e78435e9bc20bbbb2804d51c78 (diff) | |
| parent | 6dff6b74256748f182ad65634a1ab16c5989d40e (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/authserver/Main.cpp
src/server/authserver/Server/AuthSession.cpp
src/server/authserver/Server/AuthSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/scripts/World/npcs_special.cpp
Diffstat (limited to 'src/server/game/AuctionHouseBot')
| -rw-r--r-- | src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h | 2 | ||||
| -rw-r--r-- | src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h index 9c9a39cf567..df930367878 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h +++ b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h @@ -72,7 +72,7 @@ class AuctionBotBuyer : public AuctionBotAgent { public: AuctionBotBuyer(); - ~AuctionBotBuyer() override; + ~AuctionBotBuyer(); bool Initialize() override; bool Update(AuctionHouseType houseType) override; diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h index 014fe23f71a..42677a52f49 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h +++ b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.h @@ -118,7 +118,7 @@ public: typedef std::vector<uint32> ItemPool; AuctionBotSeller(); - ~AuctionBotSeller() override; + ~AuctionBotSeller(); bool Initialize() override; bool Update(AuctionHouseType houseType) override; |