From 1014f50b8978fc4cb82b5d5ce95a777b05b6a62d Mon Sep 17 00:00:00 2001 From: Schmoozerd Date: Sun, 26 Aug 2012 23:19:33 +0200 Subject: [PATCH] Fixup last commit (why didn't it ammend.. --- src/game/AchievementMgr.cpp | 2 +- src/game/BattleGround/BattleGround.cpp | 28 +- src/game/BattleGround/BattleGroundAA.cpp | 4 +- src/game/BattleGround/BattleGroundAB.cpp | 14 +- src/game/BattleGround/BattleGroundAV.cpp | 10 +- src/game/BattleGround/BattleGroundBE.cpp | 8 +- src/game/BattleGround/BattleGroundDS.cpp | 4 +- src/game/BattleGround/BattleGroundEY.cpp | 12 +- src/game/BattleGround/BattleGroundEY.h | 2 +- src/game/BattleGround/BattleGroundHandler.cpp | 22 +- src/game/BattleGround/BattleGroundIC.cpp | 4 +- src/game/BattleGround/BattleGroundMgr.cpp | 18 +- src/game/BattleGround/BattleGroundMgr.h | 4 +- src/game/BattleGround/BattleGroundNA.cpp | 8 +- src/game/BattleGround/BattleGroundRB.cpp | 4 +- src/game/BattleGround/BattleGroundRL.cpp | 8 +- src/game/BattleGround/BattleGroundRV.cpp | 4 +- src/game/BattleGround/BattleGroundSA.cpp | 4 +- src/game/BattleGround/BattleGroundWS.cpp | 14 +- src/game/GameEventMgr.cpp | 2 +- src/game/GameObject.cpp | 4 +- src/game/Group.cpp | 2 +- src/game/SpellEffects.cpp | 2 +- win/VC90/game.vcproj | 326 +++++++++--------- 24 files changed, 255 insertions(+), 255 deletions(-) diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index b6db4444c..188842a4c 100644 --- 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 index bd5afa3c4..d4cd2a0d7 100644 --- 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 index a00039fa7..30796ca23 100644 --- 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 index c107e1499..68f261361 100644 --- 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 index ed4444c59..2db990915 100644 --- 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 index d8c6e1f19..40ec1ab74 100644 --- 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 index a6c496c0a..e2ee29283 100644 --- 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 index 9dd6ddf63..ed1f3c084 100644 --- 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 index 910be0632..9e2348fc7 100644 --- 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 index fbf612aef..fe8ed2669 100644 --- 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 index b95b2e50a..182218f7e 100644 --- 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 index 83a403743..e22013824 100644 --- 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 index 1d13bccdd..83b27bf29 100644 --- 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 index 447fe9909..132a8eb46 100644 --- 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 index 734d1eee8..d59c73e74 100644 --- 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 index f481b5870..c7487392c 100644 --- 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 index 39e1d28fc..0302fdcc7 100644 --- 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 index 5321ecf01..2e7fd6b66 100644 --- 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 index 061a5486b..0698c1194 100644 --- 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 index f88eb414e..5c4848d21 100644 --- 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 index ca73f7fa2..bb8a92781 100644 --- 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 index 324ae1976..9feb4ea44 100644 --- 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" diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index d2535d6f3..567058a34 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -42,7 +42,7 @@ #include "Creature.h" #include "Totem.h" #include "CreatureAI.h" -#include "BattleGround/attleGroundMgr.h" +#include "BattleGround/BattleGroundMgr.h" #include "BattleGround/BattleGround.h" #include "BattleGround/BattleGroundEY.h" #include "BattleGround/BattleGroundWS.h" diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index fa115d952..b32d87168 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -101,6 +101,167 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -