diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-07-21 00:33:36 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-24 11:51:48 +0100 |
| commit | b4adf3f5dd34d8171f10a6a4ee8689286ef4d66a (patch) | |
| tree | 3eb9fa5816f034fb4782c516e3c52787a39bde5b /src/server/game/Groups/Group.cpp | |
| parent | b703d53073e72d5e50aa1d450340464804a8a611 (diff) | |
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176)
Conflicts:
cmake/compiler/msvc/settings.cmake
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Garrison/Garrison.cpp
src/server/game/Garrison/GarrisonMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Server/Packets/ChannelPackets.h
src/server/game/Server/Packets/PartyPackets.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/Spells/SpellScript.cpp
src/server/scripts/Commands/cs_list.cpp
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index f89c0e73008..7e3b758d92c 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -443,24 +443,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; WorldPacket newDataPacket; - player->BuildValuesUpdateBlockForPlayer(&newData, member); + player->BuildValuesUpdateBlockForPlayer(&newData, existingMember); if (newData.HasData()) { newData.BuildPacket(&newDataPacket); - member->SendDirectMessage(&newDataPacket); + existingMember->SendDirectMessage(&newDataPacket); } } } @@ -1989,8 +1989,8 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo) { 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()); } |
