-
-
Save Rochet2/7e88df43f668f6bdcdee to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp | |
index fb20d2f..c3c2850 100644 | |
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp | |
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.cpp | |
@@ -20,6 +20,7 @@ | |
#include "ObjectMgr.h" | |
#include "AuctionHouseMgr.h" | |
#include "AuctionHouseBot.h" | |
+#include "Config.h" | |
#include "Player.h" | |
#include "WorldSession.h" | |
#include <vector> | |
diff --git a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h | |
index 4dccf29..123cfc8 100644 | |
--- a/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h | |
+++ b/src/server/game/AuctionHouse/AuctionHouseBot/AuctionHouseBot.h | |
@@ -20,10 +20,13 @@ | |
#ifndef AUCTION_HOUSE_BOT_H | |
#define AUCTION_HOUSE_BOT_H | |
-#include "World.h" | |
-#include "Config.h" | |
+#include "Common.h" | |
+ | |
+struct AuctionEntry; | |
+class Player; | |
+class WorldSession; | |
+ | |
#include "ItemPrototype.h" | |
-#include "AuctionHouseMgr.h" | |
#define AHB_GREY 0 | |
#define AHB_WHITE 1 | |
#define AHB_GREEN 2 | |
@@ -1235,8 +1238,8 @@ private: | |
public: | |
static AuctionHouseBot* instance() | |
{ | |
- static AuctionHouseBot* instance = new AuctionHouseBot(); | |
- return instance; | |
+ static AuctionHouseBot instance; | |
+ return &instance; | |
} | |
~AuctionHouseBot(); | |
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp | |
index 69e0ff3..f60dc4b 100644 | |
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp | |
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp | |
@@ -27,6 +27,7 @@ | |
#include "ScriptMgr.h" | |
#include "AccountMgr.h" | |
#include "AuctionHouseMgr.h" | |
+#include "AuctionHouseBot.h" | |
#include "Item.h" | |
#include "Language.h" | |
#include "Log.h" | |
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h | |
index 2e645c8..f3b4795 100644 | |
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h | |
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h | |
@@ -23,8 +23,6 @@ | |
#include "DatabaseEnv.h" | |
#include "DBCStructure.h" | |
-#include "AuctionHouseBot/AuctionHouseBot.h" | |
- | |
class Item; | |
class Player; | |
class WorldPacket; | |
diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp | |
index 6806a54..86fa042 100644 | |
--- a/src/server/game/Handlers/AuctionHouseHandler.cpp | |
+++ b/src/server/game/Handlers/AuctionHouseHandler.cpp | |
@@ -22,7 +22,6 @@ | |
#include "WorldPacket.h" | |
#include "WorldSession.h" | |
-#include "AuctionHouseBot.h" | |
#include "AuctionHouseMgr.h" | |
#include "Log.h" | |
#include "Language.h" | |
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp | |
index 0c372fe..f39dd0f 100644 | |
--- a/src/server/scripts/Commands/cs_reload.cpp | |
+++ b/src/server/scripts/Commands/cs_reload.cpp | |
@@ -24,7 +24,7 @@ EndScriptData */ | |
#include "AccountMgr.h" | |
#include "AchievementMgr.h" | |
-#include "AuctionHouseBot.h" | |
+#include "AuctionHouseMgr.h" | |
#include "BattlegroundMgr.h" | |
#include "Chat.h" | |
#include "CreatureTextMgr.h" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment