From c80c77ff7108b77b49e275e87b59618d3c071584 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jul 2015 09:52:04 +0200 Subject: [PATCH] Core/Misc: Fix some warnings --- src/server/bnetserver/Packets/FriendsPackets.cpp | 4 ++-- src/server/collision/Management/MMapManager.cpp | 4 ++-- src/server/game/Achievements/AchievementMgr.cpp | 2 +- .../BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/bnetserver/Packets/FriendsPackets.cpp b/src/server/bnetserver/Packets/FriendsPackets.cpp index ac7fa6f15c1..a9d85877f93 100644 --- a/src/server/bnetserver/Packets/FriendsPackets.cpp +++ b/src/server/bnetserver/Packets/FriendsPackets.cpp @@ -20,8 +20,8 @@ void Battlenet::Friends::GetFriendsOfFriend::Read() { - uint8 unk = _stream.Read(2); - uint32 unk1 = _stream.Read(32); + _stream.Read(2); + _stream.Read(32); } std::string Battlenet::Friends::GetFriendsOfFriend::ToString() const diff --git a/src/server/collision/Management/MMapManager.cpp b/src/server/collision/Management/MMapManager.cpp index 59cd5ba88fb..9fe084dd7db 100644 --- a/src/server/collision/Management/MMapManager.cpp +++ b/src/server/collision/Management/MMapManager.cpp @@ -260,9 +260,9 @@ namespace MMAP for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i) { - if (const MapEntry* const map = sMapStore.LookupEntry(i)) + if (MapEntry const* map = sMapStore.LookupEntry(i)) { - if (map->rootPhaseMap == mapId) + if (map->ParentMapID == int32(mapId)) { PhasedTile* data = LoadTile(map->MapID, x, y); // only a few tiles have terrain swaps, do not write error for them diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 6b6c4bf8d7f..5a431c0fdad 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -397,7 +397,7 @@ template AchievementMgr::~AchievementMgr() { } template -void AchievementMgr::SendPacket(WorldPacket* data) const { } +void AchievementMgr::SendPacket(WorldPacket const* /*data*/) const { } template<> void AchievementMgr::SendPacket(WorldPacket* data) const diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp index 0f084a53d65..6d87a295a87 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp @@ -108,7 +108,7 @@ public: npc_twilight_flame_caller() : CreatureScript("npc_twilight_flame_caller" struct npc_twilight_flame_callerAI : public ScriptedAI { - npc_twilight_flame_callerAI(Creature* creature) : ScriptedAI(creature), _summons(me), _instance(creature->GetInstanceScript()) + npc_twilight_flame_callerAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()), _summons(me) { Initialize(); }