diff options
| author | kaelima <kaelima@live.se> | 2012-12-21 00:00:16 +0100 |
|---|---|---|
| committer | kaelima <kaelima@live.se> | 2012-12-21 00:00:16 +0100 |
| commit | 0a88787dfc747437b6278a044a425b6483e61b37 (patch) | |
| tree | 65942c84524890446a79ef67fd1ea2ce622a8544 /src/server/game/Handlers/BattleGroundHandler.cpp | |
| parent | 8f27dfda627903997b67cab9ebb4c5b365da201e (diff) | |
| parent | 4116ba75e3bef999c3111943c3b389ffc195b686 (diff) | |
Merge git://github.com/TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Movement/MovementGenerator.h
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
src/server/game/Movement/Spline/MoveSpline.h
Diffstat (limited to 'src/server/game/Handlers/BattleGroundHandler.cpp')
| -rw-r--r--[-rwxr-xr-x] | src/server/game/Handlers/BattleGroundHandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 0a076dfaa34..12f4e6ffa82 100755..100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -35,7 +35,7 @@ #include "DisableMgr.h" #include "Group.h" -void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket & recvData) +void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recvData) { uint64 guid; recvData >> guid; @@ -70,7 +70,7 @@ void WorldSession::SendBattleGroundList(uint64 guid, BattlegroundTypeId bgTypeId SendPacket(&data); } -void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData) +void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData) { uint64 guid; uint32 bgTypeId_; @@ -581,7 +581,7 @@ void WorldSession::HandleBattlefieldStatusOpcode(WorldPacket & /*recvData*/) } } -void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData) +void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_BATTLEMASTER_JOIN_ARENA"); @@ -749,7 +749,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData) sBattlegroundMgr->ScheduleQueueUpdate(matchmakerRating, arenatype, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId()); } -void WorldSession::HandleReportPvPAFK(WorldPacket & recvData) +void WorldSession::HandleReportPvPAFK(WorldPacket& recvData) { uint64 playerGuid; recvData >> playerGuid; |