diff options
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.h')
-rw-r--r-- | src/server/game/Battlefield/Battlefield.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index 1b142d1c89f..0aa6a51d6bf 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -18,13 +18,8 @@ #ifndef BATTLEFIELD_H_ #define BATTLEFIELD_H_ -#include "Utilities/Util.h" #include "SharedDefines.h" #include "ZoneScript.h" -#include "WorldPacket.h" -#include "GameObject.h" -#include "Battleground.h" -#include "ObjectAccessor.h" enum BattlefieldTypes { @@ -111,7 +106,7 @@ class BfCapturePoint bool DelCapturePoint(); // active Players in the area of the objective, 0 - alliance, 1 - horde - GuidSet m_activePlayers[2]; + GuidSet m_activePlayers[BG_TEAMS_COUNT]; // Total shift needed to capture the objective float m_maxValue; @@ -183,7 +178,7 @@ class BfGraveyard protected: TeamId m_ControlTeam; uint32 m_GraveyardId; - uint64 m_SpiritGuide[2]; + uint64 m_SpiritGuide[BG_TEAMS_COUNT]; GuidSet m_ResurrectQueue; Battlefield* m_Bf; }; @@ -287,8 +282,8 @@ class Battlefield : public ZoneScript BfGraveyard* GetGraveyardById(uint32 id) const; // Misc methods - virtual Creature* SpawnCreature(uint32 entry, float x, float y, float z, float o, TeamId team); - Creature* SpawnCreature(uint32 entry, const Position& pos, TeamId team); + virtual Creature* SpawnCreature(uint32 entry, float x, float y, float z, float o, TeamId /*teamId*/); + Creature* SpawnCreature(uint32 entry, Position const& pos, TeamId /*teamId*/); GameObject* SpawnGameObject(uint32 entry, float x, float y, float z, float o); Creature* GetCreature(uint64 GUID); @@ -346,7 +341,7 @@ class Battlefield : public ZoneScript void InvitePlayerToQueue(Player* player); void InvitePlayerToWar(Player* player); - void InitStalker(uint32 entry, float x, float y, float z, float o); + void InitStalker(uint32 entry, Position const& pos); protected: uint64 m_Guid; |