diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-07-21 00:33:36 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-07-21 00:33:36 +0200 |
| commit | a22e4e121a1e54b2f4154d59623ee4a94a449176 (patch) | |
| tree | d4fb01e9f32e3f146062f47638cb1e664568c0de /src/server/game/Server | |
| parent | 5987391073b0a7a257658ecef51f1df4f0f38842 (diff) | |
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/ChannelPackets.h | 4 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/PartyPackets.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/server/game/Server/Packets/ChannelPackets.h b/src/server/game/Server/Packets/ChannelPackets.h index 7464e9bd391..b41be6e93d1 100644 --- a/src/server/game/Server/Packets/ChannelPackets.h +++ b/src/server/game/Server/Packets/ChannelPackets.h @@ -31,8 +31,8 @@ namespace WorldPackets public: struct ChannelPlayer { - ChannelPlayer(ObjectGuid const& guid, uint32 realm, uint8 flags) : - Guid(guid), VirtualRealmAddress(realm), Flags(flags) { } + ChannelPlayer(ObjectGuid const& guid, uint32 virtualRealmAddress, uint8 flags) : + Guid(guid), VirtualRealmAddress(virtualRealmAddress), Flags(flags) { } ObjectGuid Guid; ///< Player Guid uint32 VirtualRealmAddress; diff --git a/src/server/game/Server/Packets/PartyPackets.cpp b/src/server/game/Server/Packets/PartyPackets.cpp index 81cdfd22649..1ca4d8095d0 100644 --- a/src/server/game/Server/Packets/PartyPackets.cpp +++ b/src/server/game/Server/Packets/PartyPackets.cpp @@ -475,10 +475,10 @@ void WorldPackets::Party::PartyMemberStats::Initialize(Player const* player) if (aurApp->GetFlags() & AFLAG_SCALABLE) { - for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint32 e = 0; e < MAX_SPELL_EFFECTS; ++e) { - float scale = 0.f; - if (AuraEffect const* eff = aurApp->GetBase()->GetEffect(i)) + float scale = 0.0f; + if (AuraEffect const* eff = aurApp->GetBase()->GetEffect(e)) scale = float(eff->GetAmount()); aura.EffectScales.push_back(scale); } @@ -526,10 +526,10 @@ void WorldPackets::Party::PartyMemberStats::Initialize(Player const* player) if (aurApp->GetFlags() & AFLAG_SCALABLE) { - for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) + for (uint32 e = 0; e < MAX_SPELL_EFFECTS; ++e) { - float scale = 0.f; - if (AuraEffect const* eff = aurApp->GetBase()->GetEffect(i)) + float scale = 0.0f; + if (AuraEffect const* eff = aurApp->GetBase()->GetEffect(e)) scale = float(eff->GetAmount()); aura.EffectScales.push_back(scale); } diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index d2db5378e65..d2efc15521c 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1488,16 +1488,16 @@ class WorldSession void HandleTransmogrifyItems(WorldPacket& recvData); // Miscellaneous - void HandleSpellClick(WorldPackets::Spells::SpellClick& packet); - void HandleMirrorImageDataRequest(WorldPackets::Spells::GetMirrorImageData& packet); + void HandleSpellClick(WorldPackets::Spells::SpellClick& spellClick); + void HandleMirrorImageDataRequest(WorldPackets::Spells::GetMirrorImageData& getMirrorImageData); void HandleRemoveGlyph(WorldPacket& recvData); void HandleGuildSetFocusedAchievement(WorldPackets::Achievement::GuildSetFocusedAchievement& setFocusedAchievement); - void HandleEquipmentSetSave(WorldPackets::EquipmentSet::SaveEquipmentSet& packet); - void HandleDeleteEquipmentSet(WorldPackets::EquipmentSet::DeleteEquipmentSet& packet); - void HandleUseEquipmentSet(WorldPackets::EquipmentSet::UseEquipmentSet& packet); + void HandleEquipmentSetSave(WorldPackets::EquipmentSet::SaveEquipmentSet& saveEquipmentSet); + void HandleDeleteEquipmentSet(WorldPackets::EquipmentSet::DeleteEquipmentSet& deleteEquipmentSet); + void HandleUseEquipmentSet(WorldPackets::EquipmentSet::UseEquipmentSet& useEquipmentSet); void HandleUITimeRequest(WorldPackets::Misc::UITimeRequest& /*request*/); void HandleQueryQuestCompletionNPCs(WorldPackets::Query::QueryQuestCompletionNPCs& queryQuestCompletionNPCs); - void HandleQuestPOIQuery(WorldPackets::Query::QuestPOIQuery& packet); + void HandleQuestPOIQuery(WorldPackets::Query::QuestPOIQuery& questPoiQuery); void HandleUpdateProjectilePosition(WorldPacket& recvPacket); void HandleUpdateMissileTrajectory(WorldPacket& recvPacket); void HandleViolenceLevel(WorldPackets::Misc::ViolenceLevel& violenceLevel); |