mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12131] Improve support for game/ subdirectories

Browse source 
* Add game directory to AdditionalIncludes (VC90)
* Add game directory to AdditionalIncludes (VC100)
* Simplify #include macros for subdirectories

Thanks to Shyax, LordJZ and Zergtmn for testing cmake
This commit is contained in:
Schmoozerd 2012-08-28 13:37:05 +02:00 • committed by Antz
parent 5d2dda2e2c
commit ecdb00bd0d
41 changed files with 164 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/AuctionHouseBot/AuctionHouseBot.cpp
View file

@ -1,10 +1,10 @@
#include "AuctionHouseBot.h" #include "AuctionHouseBot.h"
#include "ProgressBar.h" #include "ProgressBar.h"
#include "Log.h" #include "Log.h"
#include "../ObjectMgr.h" #include "ObjectMgr.h"
#include "../AuctionHouseMgr.h" #include "AuctionHouseMgr.h"
#include "SystemConfig.h" #include "SystemConfig.h"
#include "../SQLStorages.h" #include "SQLStorages.h"
// Format is YYYYMMDDRR where RR is the change in the conf file // Format is YYYYMMDDRR where RR is the change in the conf file
// for that day. // for that day.

8
src/game/AuctionHouseBot/AuctionHouseBot.h
View file

@ -1,11 +1,11 @@
#ifndef AUCTION_HOUSE_BOT_H #ifndef AUCTION_HOUSE_BOT_H
#define AUCTION_HOUSE_BOT_H #define AUCTION_HOUSE_BOT_H
#include "../World.h" #include "World.h"
#include "Config/Config.h" #include "Config/Config.h"
#include "../AuctionHouseMgr.h" #include "AuctionHouseMgr.h"
#include "../SharedDefines.h" #include "SharedDefines.h"
#include "../Item.h" #include "Item.h"
// shadow of ItemQualities with skipped ITEM_QUALITY_HEIRLOOM, anything after ITEM_QUALITY_ARTIFACT(6) in fact // shadow of ItemQualities with skipped ITEM_QUALITY_HEIRLOOM, anything after ITEM_QUALITY_ARTIFACT(6) in fact
enum AuctionQuality enum AuctionQuality

28
src/game/BattleGround/BattleGround.cpp
View file

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

4
src/game/BattleGround/BattleGroundAA.cpp
View file

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

14
src/game/BattleGround/BattleGroundAB.cpp
View file

@ -16,18 +16,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "../Object.h" #include "Object.h"
#include "../Player.h" #include "Player.h"
#include "BattleGround.h" #include "BattleGround.h"
#include "BattleGroundAB.h" #include "BattleGroundAB.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
#include "BattleGroundMgr.h" #include "BattleGroundMgr.h"
#include "../Language.h" #include "Language.h"
#include "Util.h" #include "Util.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "../MapManager.h" #include "MapManager.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
BattleGroundAB::BattleGroundAB() BattleGroundAB::BattleGroundAB()
{ {

10
src/game/BattleGround/BattleGroundAV.cpp
View file

@ -16,15 +16,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "../Player.h" #include "Player.h"
#include "BattleGround.h" #include "BattleGround.h"
#include "BattleGroundAV.h" #include "BattleGroundAV.h"
#include "BattleGroundMgr.h" #include "BattleGroundMgr.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../Language.h" #include "Language.h"
#include "WorldPacket.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() BattleGroundAV::BattleGroundAV()
{ {

8
src/game/BattleGround/BattleGroundBE.cpp
View file

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

4
src/game/BattleGround/BattleGroundDS.cpp
View file

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

12
src/game/BattleGround/BattleGroundEY.cpp
View file

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

2
src/game/BattleGround/BattleGroundEY.h
View file

@ -19,7 +19,7 @@
#ifndef __BATTLEGROUNDEY_H #ifndef __BATTLEGROUNDEY_H
#define __BATTLEGROUNDEY_H #define __BATTLEGROUNDEY_H
#include "../Language.h" #include "Language.h"
class BattleGround; class BattleGround;

22
src/game/BattleGround/BattleGroundHandler.cpp
View file

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

4
src/game/BattleGround/BattleGroundIC.cpp
View file

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

18
src/game/BattleGround/BattleGroundMgr.cpp
View file

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

4
src/game/BattleGround/BattleGroundMgr.h
View file

@ -22,8 +22,8 @@
#include "Common.h" #include "Common.h"
#include "Policies/Singleton.h" #include "Policies/Singleton.h"
#include "Utilities/EventProcessor.h" #include "Utilities/EventProcessor.h"
#include "../SharedDefines.h" #include "SharedDefines.h"
#include "../DBCEnums.h" #include "DBCEnums.h"
#include "BattleGround.h" #include "BattleGround.h"
#include "ace/Recursive_Thread_Mutex.h" #include "ace/Recursive_Thread_Mutex.h"

8
src/game/BattleGround/BattleGroundNA.cpp
View file

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

4
src/game/BattleGround/BattleGroundRB.cpp
View file

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

8
src/game/BattleGround/BattleGroundRL.cpp
View file

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

4
src/game/BattleGround/BattleGroundRV.cpp
View file

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

4
src/game/BattleGround/BattleGroundSA.cpp
View file

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

14
src/game/BattleGround/BattleGroundWS.cpp
View file

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

12
src/game/OutdoorPvP/OutdoorPvP.cpp
View file

@ -17,12 +17,12 @@
*/ */
#include "OutdoorPvP.h" #include "OutdoorPvP.h"
#include "../Language.h" #include "Language.h"
#include "../World.h" #include "World.h"
#include "../ObjectMgr.h" #include "ObjectMgr.h"
#include "../Object.h" #include "Object.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../Player.h" #include "Player.h"
/** /**
Function that adds a player to the players of the affected outdoor pvp zones Function that adds a player to the players of the affected outdoor pvp zones

4
src/game/OutdoorPvP/OutdoorPvP.h
View file

@ -20,8 +20,8 @@
#define OUTDOOR_PVP_H #define OUTDOOR_PVP_H
#include "Common.h" #include "Common.h"
#include "../ObjectGuid.h" #include "ObjectGuid.h"
#include "../SharedDefines.h" #include "SharedDefines.h"
#include "OutdoorPvPMgr.h" #include "OutdoorPvPMgr.h"
class WorldPacket; class WorldPacket;

12
src/game/OutdoorPvP/OutdoorPvPEP.cpp
View file

@ -18,12 +18,12 @@
#include "OutdoorPvPEP.h" #include "OutdoorPvPEP.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "../World.h" #include "World.h"
#include "../ObjectMgr.h" #include "ObjectMgr.h"
#include "../Object.h" #include "Object.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../Player.h" #include "Player.h"
OutdoorPvPEP::OutdoorPvPEP() : OutdoorPvP(), OutdoorPvPEP::OutdoorPvPEP() : OutdoorPvP(),
m_towersAlliance(0), m_towersAlliance(0),

2
src/game/OutdoorPvP/OutdoorPvPEP.h
View file

@ -21,7 +21,7 @@
#include "Common.h" #include "Common.h"
#include "OutdoorPvP.h" #include "OutdoorPvP.h"
#include "../Language.h" #include "Language.h"
enum enum
{ {

8
src/game/OutdoorPvP/OutdoorPvPGH.cpp
View file

@ -17,10 +17,10 @@
*/ */
#include "OutdoorPvPGH.h" #include "OutdoorPvPGH.h"
#include "../Map.h" #include "Map.h"
#include "../Object.h" #include "Object.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
OutdoorPvPGH::OutdoorPvPGH() : OutdoorPvP(), OutdoorPvPGH::OutdoorPvPGH() : OutdoorPvP(),
m_zoneOwner(TEAM_NONE) m_zoneOwner(TEAM_NONE)

10
src/game/OutdoorPvP/OutdoorPvPHP.cpp
View file

@ -18,11 +18,11 @@
#include "OutdoorPvPHP.h" #include "OutdoorPvPHP.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "../World.h" #include "World.h"
#include "../Object.h" #include "Object.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../Player.h" #include "Player.h"
OutdoorPvPHP::OutdoorPvPHP() : OutdoorPvP(), OutdoorPvPHP::OutdoorPvPHP() : OutdoorPvP(),
m_towersAlliance(0), m_towersAlliance(0),

2
src/game/OutdoorPvP/OutdoorPvPHP.h
View file

@ -21,7 +21,7 @@
#include "Common.h" #include "Common.h"
#include "OutdoorPvP.h" #include "OutdoorPvP.h"
#include "../Language.h" #include "Language.h"
enum enum
{ {

4
src/game/OutdoorPvP/OutdoorPvPMgr.cpp
View file

@ -19,8 +19,8 @@
#include "OutdoorPvPMgr.h" #include "OutdoorPvPMgr.h"
#include "Policies/SingletonImp.h" #include "Policies/SingletonImp.h"
#include "OutdoorPvP.h" #include "OutdoorPvP.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../World.h" #include "World.h"
#include "Log.h" #include "Log.h"
#include "OutdoorPvPEP.h" #include "OutdoorPvPEP.h"
#include "OutdoorPvPGH.h" #include "OutdoorPvPGH.h"

12
src/game/OutdoorPvP/OutdoorPvPNA.cpp
View file

@ -18,12 +18,12 @@
#include "OutdoorPvPNA.h" #include "OutdoorPvPNA.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "../World.h" #include "World.h"
#include "../ObjectMgr.h" #include "ObjectMgr.h"
#include "../Object.h" #include "Object.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../Player.h" #include "Player.h"
OutdoorPvPNA::OutdoorPvPNA() : OutdoorPvP(), OutdoorPvPNA::OutdoorPvPNA() : OutdoorPvP(),
m_zoneOwner(TEAM_NONE), m_zoneOwner(TEAM_NONE),

2
src/game/OutdoorPvP/OutdoorPvPNA.h
View file

@ -21,7 +21,7 @@
#include "Common.h" #include "Common.h"
#include "OutdoorPvP.h" #include "OutdoorPvP.h"
#include "../Language.h" #include "Language.h"
enum enum
{ {

12
src/game/OutdoorPvP/OutdoorPvPSI.cpp
View file

@ -18,12 +18,12 @@
#include "OutdoorPvPSI.h" #include "OutdoorPvPSI.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "../World.h" #include "World.h"
#include "../ObjectMgr.h" #include "ObjectMgr.h"
#include "../Object.h" #include "Object.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../Player.h" #include "Player.h"
OutdoorPvPSI::OutdoorPvPSI() : OutdoorPvP(), OutdoorPvPSI::OutdoorPvPSI() : OutdoorPvP(),
m_resourcesAlliance(0), m_resourcesAlliance(0),

2
src/game/OutdoorPvP/OutdoorPvPSI.h
View file

@ -21,7 +21,7 @@
#include "Common.h" #include "Common.h"
#include "OutdoorPvP.h" #include "OutdoorPvP.h"
#include "../Language.h" #include "Language.h"
enum enum
{ {

12
src/game/OutdoorPvP/OutdoorPvPTF.cpp
View file

@ -18,12 +18,12 @@
#include "OutdoorPvPTF.h" #include "OutdoorPvPTF.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "../World.h" #include "World.h"
#include "../ObjectMgr.h" #include "ObjectMgr.h"
#include "../Object.h" #include "Object.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../Player.h" #include "Player.h"
OutdoorPvPTF::OutdoorPvPTF() : OutdoorPvP(), OutdoorPvPTF::OutdoorPvPTF() : OutdoorPvP(),
m_zoneWorldState(WORLD_STATE_TF_TOWERS_CONTROLLED), m_zoneWorldState(WORLD_STATE_TF_TOWERS_CONTROLLED),

2
src/game/OutdoorPvP/OutdoorPvPTF.h
View file

@ -21,7 +21,7 @@
#include "Common.h" #include "Common.h"
#include "OutdoorPvP.h" #include "OutdoorPvP.h"
#include "../Language.h" #include "Language.h"
enum enum
{ {

12
src/game/OutdoorPvP/OutdoorPvPZM.cpp
View file

@ -18,12 +18,12 @@
#include "OutdoorPvPZM.h" #include "OutdoorPvPZM.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "../World.h" #include "World.h"
#include "../ObjectMgr.h" #include "ObjectMgr.h"
#include "../Object.h" #include "Object.h"
#include "../Creature.h" #include "Creature.h"
#include "../GameObject.h" #include "GameObject.h"
#include "../Player.h" #include "Player.h"
OutdoorPvPZM::OutdoorPvPZM() : OutdoorPvP(), OutdoorPvPZM::OutdoorPvPZM() : OutdoorPvP(),
m_graveyardOwner(TEAM_NONE), m_graveyardOwner(TEAM_NONE),

2
src/game/OutdoorPvP/OutdoorPvPZM.h
View file

@ -21,7 +21,7 @@
#include "Common.h" #include "Common.h"
#include "OutdoorPvP.h" #include "OutdoorPvP.h"
#include "../Language.h" #include "Language.h"
enum enum
{ {

4
src/game/movement/MoveSplineInit.cpp
View file

@ -19,8 +19,8 @@
#include "MoveSplineInit.h" #include "MoveSplineInit.h"
#include "MoveSpline.h" #include "MoveSpline.h"
#include "packet_builder.h" #include "packet_builder.h"
#include "../Unit.h" #include "Unit.h"
#include "../TransportSystem.h" #include "TransportSystem.h"
namespace Movement namespace Movement
{ {

2
src/game/movement/MoveSplineInit.h
View file

@ -20,7 +20,7 @@
#define MANGOSSERVER_MOVESPLINEINIT_H #define MANGOSSERVER_MOVESPLINEINIT_H
#include "MoveSplineInitArgs.h" #include "MoveSplineInitArgs.h"
#include "../PathFinder.h" #include "PathFinder.h"
class Unit; class Unit;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12130" #define REVISION_NR "12131"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

12
win/VC100/game.vcxproj
View file

@ -136,7 +136,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -173,7 +173,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -207,7 +207,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm300 %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -244,7 +244,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -277,7 +277,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_NoPCH|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -313,7 +313,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;MANGOS_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

12
win/VC90/game.vcproj
View file

@ -47,7 +47,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP /Zm200" AdditionalOptions="/MP /Zm200"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false" StringPooling="false"
MinimalRebuild="false" MinimalRebuild="false"
@ -130,7 +130,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj /Zm200" AdditionalOptions="/MP /bigobj /Zm200"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false" StringPooling="false"
MinimalRebuild="false" MinimalRebuild="false"
@ -213,7 +213,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP /Zm200" AdditionalOptions="/MP /Zm200"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -295,7 +295,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj /Zm200" AdditionalOptions="/MP /bigobj /Zm200"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -377,7 +377,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false" StringPooling="false"
MinimalRebuild="false" MinimalRebuild="false"
@ -458,7 +458,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP /bigobj" AdditionalOptions="/MP /bigobj"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\game\vmap;..\..\dep\ACE_wrappers;..\..\dep\include\g3dlite;..\..\src\game"
PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;"
StringPooling="false" StringPooling="false"
MinimalRebuild="false" MinimalRebuild="false"