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

[11468] Finally remove all uses Object::GetGUID from core sources.

Browse source 
GetGUID() is now depricted function and will removed soon.
Still exist just for give time for update patches/scripts.
This commit is contained in:
VladimirMangos 2011-05-11 01:46:03 +04:00
parent 1e38db574a
commit 5ff698f53a
7 changed files with 214 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/game/ChannelHandler.cpp
View file

@ -36,7 +36,7 @@ void WorldSession::HandleJoinChannelOpcode(WorldPacket& recvPacket)
recvPacket >> pass;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetJoinChannel(channelname, channel_id))
chn->Join(_player->GetGUID(), pass.c_str());
chn->Join(_player->GetObjectGuid(), pass.c_str());
}
void WorldSession::HandleLeaveChannelOpcode(WorldPacket& recvPacket)
@ -55,7 +55,7 @@ void WorldSession::HandleLeaveChannelOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
{
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->Leave(_player->GetGUID(), true);
chn->Leave(_player->GetObjectGuid(), true);
cMgr->LeftChannel(channelname);
}
}
@ -83,7 +83,7 @@ void WorldSession::HandleChannelPasswordOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->Password(_player->GetGUID(), pass.c_str());
chn->Password(_player->GetObjectGuid(), pass.c_str());
}
void WorldSession::HandleChannelSetOwnerOpcode(WorldPacket& recvPacket)
@ -100,7 +100,7 @@ void WorldSession::HandleChannelSetOwnerOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->SetOwner(_player->GetGUID(), newp.c_str());
chn->SetOwner(_player->GetObjectGuid(), newp.c_str());
}
void WorldSession::HandleChannelOwnerOpcode(WorldPacket& recvPacket)
@ -111,7 +111,7 @@ void WorldSession::HandleChannelOwnerOpcode(WorldPacket& recvPacket)
recvPacket >> channelname;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->SendWhoOwner(_player->GetGUID());
chn->SendWhoOwner(_player->GetObjectGuid());
}
void WorldSession::HandleChannelModeratorOpcode(WorldPacket& recvPacket)
@ -128,7 +128,7 @@ void WorldSession::HandleChannelModeratorOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->SetModerator(_player->GetGUID(), otp.c_str());
chn->SetModerator(_player->GetObjectGuid(), otp.c_str());
}
void WorldSession::HandleChannelUnmoderatorOpcode(WorldPacket& recvPacket)
@ -145,7 +145,7 @@ void WorldSession::HandleChannelUnmoderatorOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->UnsetModerator(_player->GetGUID(), otp.c_str());
chn->UnsetModerator(_player->GetObjectGuid(), otp.c_str());
}
void WorldSession::HandleChannelMuteOpcode(WorldPacket& recvPacket)
@ -162,7 +162,7 @@ void WorldSession::HandleChannelMuteOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->SetMute(_player->GetGUID(), otp.c_str());
chn->SetMute(_player->GetObjectGuid(), otp.c_str());
}
void WorldSession::HandleChannelUnmuteOpcode(WorldPacket& recvPacket)
@ -180,7 +180,7 @@ void WorldSession::HandleChannelUnmuteOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->UnsetMute(_player->GetGUID(), otp.c_str());
chn->UnsetMute(_player->GetObjectGuid(), otp.c_str());
}
void WorldSession::HandleChannelInviteOpcode(WorldPacket& recvPacket)
@ -197,7 +197,7 @@ void WorldSession::HandleChannelInviteOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->Invite(_player->GetGUID(), otp.c_str());
chn->Invite(_player->GetObjectGuid(), otp.c_str());
}
void WorldSession::HandleChannelKickOpcode(WorldPacket& recvPacket)
@ -213,7 +213,7 @@ void WorldSession::HandleChannelKickOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->Kick(_player->GetGUID(), otp.c_str());
chn->Kick(_player->GetObjectGuid(), otp.c_str());
}
void WorldSession::HandleChannelBanOpcode(WorldPacket& recvPacket)
@ -230,7 +230,7 @@ void WorldSession::HandleChannelBanOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->Ban(_player->GetGUID(), otp.c_str());
chn->Ban(_player->GetObjectGuid(), otp.c_str());
}
void WorldSession::HandleChannelUnbanOpcode(WorldPacket& recvPacket)
@ -248,7 +248,7 @@ void WorldSession::HandleChannelUnbanOpcode(WorldPacket& recvPacket)
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->UnBan(_player->GetGUID(), otp.c_str());
chn->UnBan(_player->GetObjectGuid(), otp.c_str());
}
void WorldSession::HandleChannelAnnouncementsOpcode(WorldPacket& recvPacket)
@ -259,7 +259,7 @@ void WorldSession::HandleChannelAnnouncementsOpcode(WorldPacket& recvPacket)
recvPacket >> channelname;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->Announce(_player->GetGUID());
chn->Announce(_player->GetObjectGuid());
}
void WorldSession::HandleChannelModerateOpcode(WorldPacket& recvPacket)
@ -270,7 +270,7 @@ void WorldSession::HandleChannelModerateOpcode(WorldPacket& recvPacket)
recvPacket >> channelname;
if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if(Channel *chn = cMgr->GetChannel(channelname, _player))
chn->Moderate(_player->GetGUID());
chn->Moderate(_player->GetObjectGuid());
}
void WorldSession::HandleChannelDisplayListQueryOpcode(WorldPacket &recvPacket)