Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler

Browse Source
This commit is contained in:
Shauren
2015-07-21 00:33:36 +02:00
parent 5987391073
commit a22e4e121a
47 changed files with 311 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Groups/Group.cpp
View File

@@ -488,24 +488,24 @@ bool Group::AddMember(Player* player)
if (itr->GetSource() == player)
continue;
if (Player* member = itr->GetSource())
if (Player* existingMember = itr->GetSource())
{
if (player->HaveAtClient(member))
if (player->HaveAtClient(existingMember))
{
member->SetFieldNotifyFlag(UF_FLAG_PARTY_MEMBER);
member->BuildValuesUpdateBlockForPlayer(&groupData, player);
member->RemoveFieldNotifyFlag(UF_FLAG_PARTY_MEMBER);
existingMember->SetFieldNotifyFlag(UF_FLAG_PARTY_MEMBER);
existingMember->BuildValuesUpdateBlockForPlayer(&groupData, player);
existingMember->RemoveFieldNotifyFlag(UF_FLAG_PARTY_MEMBER);
}
if (member->HaveAtClient(player))
if (existingMember->HaveAtClient(player))
{
UpdateData newData(player->GetMapId());
WorldPacket newDataPacket;
player->BuildValuesUpdateBlockForPlayer(&newData, member);
player->BuildValuesUpdateBlockForPlayer(&newData, existingMember);
if (newData.HasData())
{
newData.BuildPacket(&newDataPacket);
member->SendDirectMessage(&newDataPacket);
existingMember->SendDirectMessage(&newDataPacket);
}
}
}
@@ -2118,8 +2118,8 @@ void Group::ResetInstances(uint8 method, bool isRaid, bool isLegacy, Player* Sen
{
if (Group* group = SendMsgTo->GetGroup())
{
for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
if (Player* player = itr->GetSource())
for (GroupReference* groupRef = group->GetFirstMember(); groupRef != NULL; groupRef = groupRef->next())
if (Player* player = groupRef->GetSource())
player->SendResetInstanceSuccess(instanceSave->GetMapId());
}