diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-05-18 23:52:58 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-05-18 23:53:25 +0200 |
| commit | c5d3dd90bea3889ef5fcd33c9ef0d59d7c544f8a (patch) | |
| tree | aa7fde6f924fc39da54908bd6eeeb0be422e5fc3 /src/server/game/Battlefield/Battlefield.cpp | |
| parent | 74456703146194de72424ec98c4ea76402077be6 (diff) | |
Core/Game: Include cleanup
* Mostly aimed at removing Log/DatabaseEnv includes from other headers
* Fix most packet headers including other packet headers - moved common structures such as ItemInstance to their own files
* Moved SAI function definitions to source files (massive or requiring many different dependencies)
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 533674ff156..7eca59ffd73 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -24,12 +24,15 @@ #include "GridNotifiersImpl.h" #include "Group.h" #include "GroupMgr.h" +#include "Log.h" #include "Map.h" #include "MapManager.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "WorldPacket.h" +#include "BattlegroundPackets.h" #include "MiscPackets.h" +#include "WorldStatePackets.h" Battlefield::Battlefield() { @@ -252,6 +255,11 @@ void Battlefield::InvitePlayersInZoneToWar() } } +uint64 Battlefield::GetQueueId() const +{ + return MAKE_PAIR64(m_BattleId | 0x20000, 0x1F100000); +} + void Battlefield::InvitePlayerToWar(Player* player) { if (!player) |
