diff options
Diffstat (limited to 'src/game/ArenaTeamHandler.cpp')
| -rw-r--r-- | src/game/ArenaTeamHandler.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp index 9ba2e65ec92..be802e822c0 100644 --- a/src/game/ArenaTeamHandler.cpp +++ b/src/game/ArenaTeamHandler.cpp @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * - * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,18 +18,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "WorldSession.h" +#include "Player.h" +#include "World.h" #include "WorldPacket.h" -#include "Log.h" +#include "WorldSession.h" #include "Database/DatabaseEnv.h" -#include "Player.h" -#include "ObjectMgr.h" + #include "ArenaTeam.h" -#include "World.h" +#include "Log.h" +#include "ObjectMgr.h" #include "SocialMgr.h" -#include "Language.h" -void WorldSession::HandleInspectArenaStatsOpcode(WorldPacket & recv_data) +void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recv_data) { sLog.outDebug("MSG_INSPECT_ARENA_TEAMS"); @@ -37,11 +37,11 @@ void WorldSession::HandleInspectArenaStatsOpcode(WorldPacket & recv_data) uint64 guid; recv_data >> guid; - sLog.outDebug("Inspect Arena stats " I64FMTD, guid); + sLog.outDebug("Inspect Arena stats (GUID: %u TypeId: %u)", GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid))); if(Player *plr = objmgr.GetPlayer(guid)) { - for (uint8 i = 0; i < MAX_ARENA_SLOT; i++) + for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i) { if(uint32 a_id = plr->GetArenaTeamId(i)) { @@ -85,9 +85,9 @@ void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recv_data) arenateam->Roster(this); } -void WorldSession::HandleArenaTeamAddMemberOpcode(WorldPacket & recv_data) +void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data) { - sLog.outDebug("CMSG_ARENA_TEAM_ADD_MEMBER"); + sLog.outDebug("CMSG_ARENA_TEAM_INVITE"); CHECK_PACKET_SIZE(recv_data, 4+1); @@ -165,15 +165,15 @@ void WorldSession::HandleArenaTeamAddMemberOpcode(WorldPacket & recv_data) sLog.outDebug("WORLD: Sent SMSG_ARENA_TEAM_INVITE"); } -void WorldSession::HandleArenaTeamInviteAcceptOpcode(WorldPacket & /*recv_data*/) +void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/) { - sLog.outDebug("CMSG_ARENA_TEAM_INVITE_ACCEPT"); // empty opcode + sLog.outDebug("CMSG_ARENA_TEAM_ACCEPT"); // empty opcode ArenaTeam *at = objmgr.GetArenaTeamById(_player->GetArenaTeamIdInvited()); if(!at) return; - if(_player->GetArenaTeamIdFromDB(_player->GetGUIDLow(), at->GetType())) + if(_player->GetArenaTeamId(at->GetSlot())) { SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ALREADY_IN_ARENA_TEAM); // already in arena team that size return; @@ -197,9 +197,9 @@ void WorldSession::HandleArenaTeamInviteAcceptOpcode(WorldPacket & /*recv_data*/ at->BroadcastPacket(&data); } -void WorldSession::HandleArenaTeamInviteDeclineOpcode(WorldPacket & /*recv_data*/) +void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recv_data*/) { - sLog.outDebug("CMSG_ARENA_TEAM_INVITE_DECLINE"); // empty opcode + sLog.outDebug("CMSG_ARENA_TEAM_DECLINE"); // empty opcode _player->SetArenaTeamIdInvited(0); // no more invited } @@ -264,9 +264,9 @@ void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recv_data) delete at; } -void WorldSession::HandleArenaTeamRemoveFromTeamOpcode(WorldPacket & recv_data) +void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recv_data) { - sLog.outDebug("CMSG_ARENA_TEAM_REMOVE_FROM_TEAM"); + sLog.outDebug("CMSG_ARENA_TEAM_REMOVE"); CHECK_PACKET_SIZE(recv_data, 4+1); @@ -310,9 +310,9 @@ void WorldSession::HandleArenaTeamRemoveFromTeamOpcode(WorldPacket & recv_data) at->BroadcastPacket(&data); } -void WorldSession::HandleArenaTeamPromoteToCaptainOpcode(WorldPacket & recv_data) +void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recv_data) { - sLog.outDebug("CMSG_ARENA_TEAM_PROMOTE_TO_CAPTAIN"); + sLog.outDebug("CMSG_ARENA_TEAM_LEADER"); CHECK_PACKET_SIZE(recv_data, 4+1); |