aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/AuctionHouseBot.h2
-rw-r--r--src/game/AuctionHouseHandler.cpp (renamed from src/game/AuctionHouse.cpp)2
-rw-r--r--src/game/AuctionHouseMgr.h (renamed from src/game/AuctionHouseObject.h)0
-rw-r--r--src/game/Makefile.am4
-rw-r--r--src/game/ObjectMgr.h2
-rw-r--r--src/game/PlayerDump.h2
-rw-r--r--win/VC71/game.vcproj4
-rw-r--r--win/VC80/game.vcproj4
-rw-r--r--win/VC90/game.vcproj4
9 files changed, 12 insertions, 12 deletions
diff --git a/src/game/AuctionHouseBot.h b/src/game/AuctionHouseBot.h
index afb3e15e968..0d45adb415f 100644
--- a/src/game/AuctionHouseBot.h
+++ b/src/game/AuctionHouseBot.h
@@ -3,7 +3,7 @@
#include "Common.h"
#include "Log.h"
#include "Config/ConfigEnv.h"
-#include "AuctionHouseObject.h"
+#include "AuctionHouseMgr.h"
#define AHB_GREY 0
#define AHB_WHITE 1
#define AHB_GREEN 2
diff --git a/src/game/AuctionHouse.cpp b/src/game/AuctionHouseHandler.cpp
index b9bafdf0eb6..cb72862c2c0 100644
--- a/src/game/AuctionHouse.cpp
+++ b/src/game/AuctionHouseHandler.cpp
@@ -26,7 +26,7 @@
#include "ObjectMgr.h"
#include "Player.h"
#include "UpdateMask.h"
-#include "AuctionHouseObject.h"
+#include "AuctionHouseMgr.h"
#include "Util.h"
#include "AuctionHouseBot.h"
diff --git a/src/game/AuctionHouseObject.h b/src/game/AuctionHouseMgr.h
index f82867c5742..f82867c5742 100644
--- a/src/game/AuctionHouseObject.h
+++ b/src/game/AuctionHouseMgr.h
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index 6107a75f20e..2a8bfd23925 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -42,8 +42,8 @@ libmangosgame_a_SOURCES = \
ArenaTeam.cpp \
ArenaTeam.h \
ArenaTeamHandler.cpp \
- AuctionHouse.cpp \
- AuctionHouseObject.h \
+ AuctionHouseHandler.cpp \
+ AuctionHouseMgr.h \
Bag.cpp \
Bag.h \
BattleGround.cpp \
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 99cd9a5d573..dd26e7fb37b 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -34,7 +34,7 @@
#include "ItemPrototype.h"
#include "NPCHandler.h"
#include "Database/DatabaseEnv.h"
-#include "AuctionHouseObject.h"
+#include "AuctionHouseMgr.h"
#include "Mail.h"
#include "Map.h"
#include "ObjectAccessor.h"
diff --git a/src/game/PlayerDump.h b/src/game/PlayerDump.h
index 365406beede..206045a1be3 100644
--- a/src/game/PlayerDump.h
+++ b/src/game/PlayerDump.h
@@ -34,7 +34,7 @@
#include "ItemPrototype.h"
#include "NPCHandler.h"
#include "Database/DatabaseEnv.h"
-#include "AuctionHouseObject.h"
+#include "AuctionHouseMgr.h"
#include "Mail.h"
#include "Map.h"
#include "ObjectAccessor.h"
diff --git a/win/VC71/game.vcproj b/win/VC71/game.vcproj
index 04c5679b167..fef56d9493f 100644
--- a/win/VC71/game.vcproj
+++ b/win/VC71/game.vcproj
@@ -153,7 +153,7 @@
RelativePath="..\..\src\game\ArenaTeamHandler.cpp">
</File>
<File
- RelativePath="..\..\src\game\AuctionHouse.cpp">
+ RelativePath="..\..\src\game\AuctionHouseHandler.cpp">
</File>
<File
RelativePath="..\..\src\game\BattleGround.cpp">
@@ -590,7 +590,7 @@
RelativePath="..\..\src\game\ArenaTeam.h">
</File>
<File
- RelativePath="..\..\src\game\AuctionHouseObject.h">
+ RelativePath="..\..\src\game\AuctionHouseMgr.h">
</File>
<File
RelativePath="..\..\src\game\Bag.cpp">
diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index 46911487f83..72e0a05d168 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -375,7 +375,7 @@
>
</File>
<File
- RelativePath="..\..\src\game\AuctionHouse.cpp"
+ RelativePath="..\..\src\game\AuctionHouseHandler.cpp"
>
</File>
<File
@@ -926,7 +926,7 @@
>
</File>
<File
- RelativePath="..\..\src\game\AuctionHouseObject.h"
+ RelativePath="..\..\src\game\AuctionHouseMgr.h"
>
</File>
<File
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 90186336003..bbfbe10d6b0 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -377,7 +377,7 @@
>
</File>
<File
- RelativePath="..\..\src\game\AuctionHouse.cpp"
+ RelativePath="..\..\src\game\AuctionHouseHandler.cpp"
>
</File>
<File
@@ -919,7 +919,7 @@
>
</File>
<File
- RelativePath="..\..\src\game\AuctionHouseObject.h"
+ RelativePath="..\..\src\game\AuctionHouseMgr.h"
>
</File>
<File