Fixup last commit (why didn't it ammend..

xfurry · Aug 26, 2012 · b65bed5 · b65bed5
1 parent 4cfd787
commit b65bed5
Show file tree

Hide file tree

Showing 24 changed files with 133 additions and 133 deletions.
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
@@ -37,7 +37,7 @@
 #include "Language.h"
 #include "MapManager.h"
 #include "BattleGround/BattleGround.h"
-#include "BattleGroundAB.h"
+#include "BattleGround/BattleGroundAB.h"
 #include "Map.h"
 #include "InstanceData.h"
 #include "DBCStructure.h"

diff --git a/src/game/BattleGround/BattleGround.cpp b/src/game/BattleGround/BattleGround.cpp
@@ -16,24 +16,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "../Object.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
-#include "Creature.h"
-#include "MapManager.h"
-#include "Language.h"
-#include "SpellAuras.h"
-#include "ArenaTeam.h"
-#include "World.h"
-#include "Group.h"
-#include "ObjectGuid.h"
-#include "ObjectMgr.h"
-#include "Mail.h"
+#include "../Creature.h"
+#include "../MapManager.h"
+#include "../Language.h"
+#include "../SpellAuras.h"
+#include "../ArenaTeam.h"
+#include "../World.h"
+#include "../Group.h"
+#include "../ObjectGuid.h"
+#include "../ObjectMgr.h"
+#include "../Mail.h"
 #include "WorldPacket.h"
 #include "Util.h"
-#include "Formulas.h"
-#include "GridNotifiersImpl.h"
+#include "../Formulas.h"
+#include "../GridNotifiersImpl.h"
 
 namespace MaNGOS
 {

diff --git a/src/game/BattleGround/BattleGroundAA.cpp b/src/game/BattleGround/BattleGroundAA.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
-#include "Language.h"
+#include "../Language.h"
 
 BattleGroundAA::BattleGroundAA()
 {

diff --git a/src/game/BattleGround/BattleGroundAB.cpp b/src/game/BattleGround/BattleGroundAB.cpp
@@ -16,18 +16,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "../Object.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
-#include "Creature.h"
-#include "GameObject.h"
+#include "../Creature.h"
+#include "../GameObject.h"
 #include "BattleGroundMgr.h"
-#include "Language.h"
+#include "../Language.h"
 #include "Util.h"
 #include "WorldPacket.h"
-#include "MapManager.h"
-#include "DBCStores.h"                                      // TODO REMOVE this when graveyard handling for pvp is updated
+#include "../MapManager.h"
+#include "../DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
 
 BattleGroundAB::BattleGroundAB()
 {

diff --git a/src/game/BattleGround/BattleGroundAV.cpp b/src/game/BattleGround/BattleGroundAV.cpp
@@ -16,15 +16,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
 #include "BattleGroundMgr.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "Language.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+#include "../Language.h"
 #include "WorldPacket.h"
-#include "DBCStores.h"                                      // TODO REMOVE this when graveyard handling for pvp is updated
+#include "../DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
 
 BattleGroundAV::BattleGroundAV()
 {

diff --git a/src/game/BattleGround/BattleGroundBE.cpp b/src/game/BattleGround/BattleGroundBE.cpp
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "../Object.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
-#include "ObjectMgr.h"
+#include "../ObjectMgr.h"
 #include "WorldPacket.h"
-#include "Language.h"
+#include "../Language.h"
 
 BattleGroundBE::BattleGroundBE()
 {

diff --git a/src/game/BattleGround/BattleGroundDS.cpp b/src/game/BattleGround/BattleGroundDS.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
-#include "Language.h"
+#include "../Language.h"
 
 BattleGroundDS::BattleGroundDS()
 {

diff --git a/src/game/BattleGround/BattleGroundEY.cpp b/src/game/BattleGround/BattleGroundEY.cpp
@@ -16,17 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "../Object.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundEY.h"
-#include "Creature.h"
-#include "ObjectMgr.h"
+#include "../Creature.h"
+#include "../ObjectMgr.h"
 #include "BattleGroundMgr.h"
-#include "Language.h"
+#include "../Language.h"
 #include "WorldPacket.h"
 #include "Util.h"
-#include "MapManager.h"
+#include "../MapManager.h"
 
 BattleGroundEY::BattleGroundEY()
 {

diff --git a/src/game/BattleGround/BattleGroundEY.h b/src/game/BattleGround/BattleGroundEY.h
@@ -19,7 +19,7 @@
 #ifndef __BATTLEGROUNDEY_H
 #define __BATTLEGROUNDEY_H
 
-#include "Language.h"
+#include "../Language.h"
 
 class BattleGround;
 

diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp
@@ -17,22 +17,22 @@
  */
 
 #include "Common.h"
-#include "SharedDefines.h"
+#include "../SharedDefines.h"
 #include "WorldPacket.h"
-#include "Opcodes.h"
+#include "../Opcodes.h"
 #include "Log.h"
-#include "Player.h"
-#include "ObjectMgr.h"
-#include "WorldSession.h"
-#include "Object.h"
-#include "Chat.h"
+#include "../Player.h"
+#include "../ObjectMgr.h"
+#include "../WorldSession.h"
+#include "../Object.h"
+#include "../Chat.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundWS.h"
 #include "BattleGround.h"
-#include "ArenaTeam.h"
-#include "Language.h"
-#include "ScriptMgr.h"
-#include "World.h"
+#include "../ArenaTeam.h"
+#include "../Language.h"
+#include "../ScriptMgr.h"
+#include "../World.h"
 
 void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recv_data)
 {

diff --git a/src/game/BattleGround/BattleGroundIC.cpp b/src/game/BattleGround/BattleGroundIC.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundIC.h"
-#include "Language.h"
+#include "../Language.h"
 
 BattleGroundIC::BattleGroundIC()
 {

diff --git a/src/game/BattleGround/BattleGroundMgr.cpp b/src/game/BattleGround/BattleGroundMgr.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Player.h"
+#include "../SharedDefines.h"
+#include "../Player.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundAV.h"
 #include "BattleGroundAB.h"
@@ -33,15 +33,15 @@
 #include "BattleGroundRV.h"
 #include "BattleGroundIC.h"
 #include "BattleGroundRB.h"
-#include "MapManager.h"
-#include "Map.h"
-#include "ObjectMgr.h"
+#include "../MapManager.h"
+#include "../Map.h"
+#include "../ObjectMgr.h"
 #include "ProgressBar.h"
-#include "Chat.h"
-#include "ArenaTeam.h"
-#include "World.h"
+#include "../Chat.h"
+#include "../ArenaTeam.h"
+#include "../World.h"
 #include "WorldPacket.h"
-#include "GameEventMgr.h"
+#include "../GameEventMgr.h"
 
 #include "Policies/SingletonImp.h"
 

diff --git a/src/game/BattleGround/BattleGroundMgr.h b/src/game/BattleGround/BattleGroundMgr.h
@@ -22,8 +22,8 @@
 #include "Common.h"
 #include "Policies/Singleton.h"
 #include "Utilities/EventProcessor.h"
-#include "SharedDefines.h"
-#include "DBCEnums.h"
+#include "../SharedDefines.h"
+#include "../DBCEnums.h"
 #include "BattleGround.h"
 #include "ace/Recursive_Thread_Mutex.h"
 

diff --git a/src/game/BattleGround/BattleGroundNA.cpp b/src/game/BattleGround/BattleGroundNA.cpp
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "../Object.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
-#include "ObjectMgr.h"
+#include "../ObjectMgr.h"
 #include "WorldPacket.h"
-#include "Language.h"
+#include "../Language.h"
 
 BattleGroundNA::BattleGroundNA()
 {

diff --git a/src/game/BattleGround/BattleGroundRB.cpp b/src/game/BattleGround/BattleGroundRB.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRB.h"
-#include "Language.h"
+#include "../Language.h"
 
 BattleGroundRB::BattleGroundRB()
 {

diff --git a/src/game/BattleGround/BattleGroundRL.cpp b/src/game/BattleGround/BattleGroundRL.cpp
@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "../Object.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "ObjectMgr.h"
-#include "Language.h"
+#include "../ObjectMgr.h"
+#include "../Language.h"
 #include "WorldPacket.h"
 
 BattleGroundRL::BattleGroundRL()

diff --git a/src/game/BattleGround/BattleGroundRV.cpp b/src/game/BattleGround/BattleGroundRV.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
-#include "Language.h"
+#include "../Language.h"
 
 BattleGroundRV::BattleGroundRV()
 {

diff --git a/src/game/BattleGround/BattleGroundSA.cpp b/src/game/BattleGround/BattleGroundSA.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
-#include "Language.h"
+#include "../Language.h"
 
 BattleGroundSA::BattleGroundSA()
 {

diff --git a/src/game/BattleGround/BattleGroundWS.cpp b/src/game/BattleGround/BattleGroundWS.cpp
@@ -16,17 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "../Object.h"
+#include "../Player.h"
 #include "BattleGround.h"
 #include "BattleGroundWS.h"
-#include "Creature.h"
-#include "GameObject.h"
-#include "ObjectMgr.h"
+#include "../Creature.h"
+#include "../GameObject.h"
+#include "../ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "WorldPacket.h"
-#include "Language.h"
-#include "MapManager.h"
+#include "../Language.h"
+#include "../MapManager.h"
 
 BattleGroundWS::BattleGroundWS()
 {

diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
@@ -25,7 +25,7 @@
 #include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
 #include "MassMailMgr.h"
 #include "SpellMgr.h"
 #include "Policies/SingletonImp.h"

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
@@ -34,8 +34,8 @@
 #include "InstanceData.h"
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
-#include "BattleGround.h"
-#include "BattleGroundAV.h"
+#include "BattleGround/BattleGround.h"
+#include "BattleGround/BattleGroundAV.h"
 #include "OutdoorPvP/OutdoorPvP.h"
 #include "Util.h"
 #include "ScriptMgr.h"

diff --git a/src/game/Group.cpp b/src/game/Group.cpp
@@ -27,7 +27,7 @@
 #include "Group.h"
 #include "Formulas.h"
 #include "ObjectAccessor.h"
-#include "BattleGound/BattleGround.h"
+#include "BattleGround/BattleGround.h"
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
 #include "Util.h"