From c0c4ed7135482042a81d9e8e5f2435301771b00b Mon Sep 17 00:00:00 2001 From: Carbenium Date: Sat, 28 Nov 2015 01:02:13 +0100 Subject: [PATCH] Misc: Fix some warnings reported by GCC 4.9 --- src/server/game/BattlePets/BattlePetMgr.cpp | 2 +- src/server/game/Handlers/NPCHandler.cpp | 4 ---- src/server/game/Server/Packets/MovementPackets.cpp | 4 ++-- src/tools/mmaps_generator/MapBuilder.cpp | 2 +- src/tools/vmap4_extractor/vmapexport.cpp | 2 -- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/server/game/BattlePets/BattlePetMgr.cpp b/src/server/game/BattlePets/BattlePetMgr.cpp index c8d267810973b..925e9c71903c1 100644 --- a/src/server/game/BattlePets/BattlePetMgr.cpp +++ b/src/server/game/BattlePets/BattlePetMgr.cpp @@ -445,7 +445,7 @@ void BattlePetMgr::SummonPet(ObjectGuid guid) return; // TODO: set proper CreatureID for spell DEFAULT_SUMMON_BATTLE_PET_SPELL (default EffectMiscValueA is 40721 - Murkimus the Gladiator) - _owner->GetPlayer()->CastSpell(_owner->GetPlayer(), speciesEntry->SummonSpellID ? speciesEntry->SummonSpellID : DEFAULT_SUMMON_BATTLE_PET_SPELL); + _owner->GetPlayer()->CastSpell(_owner->GetPlayer(), speciesEntry->SummonSpellID ? speciesEntry->SummonSpellID : uint32(DEFAULT_SUMMON_BATTLE_PET_SPELL)); // TODO: set pet level, quality... update fields } diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index a6e192521f47b..001f6cbeff043 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -129,7 +129,6 @@ void WorldSession::SendTrainerList(ObjectGuid guid, const std::string& strTitle) TrainerSpell const* tSpell = &itr->second; bool valid = true; - bool primary_prof_first_rank = false; for (uint8 i = 0; i < MAX_TRAINERSPELL_ABILITY_REQS; ++i) { if (!tSpell->ReqAbility[i]) @@ -139,9 +138,6 @@ void WorldSession::SendTrainerList(ObjectGuid guid, const std::string& strTitle) valid = false; break; } - SpellInfo const* learnedSpellInfo = sSpellMgr->GetSpellInfo(tSpell->ReqAbility[i]); - if (learnedSpellInfo && learnedSpellInfo->IsPrimaryProfessionFirstRank()) - primary_prof_first_rank = true; } if (!valid) diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp index 33f67842bfe39..8b511fb3ea56b 100644 --- a/src/server/game/Server/Packets/MovementPackets.cpp +++ b/src/server/game/Server/Packets/MovementPackets.cpp @@ -81,7 +81,7 @@ ByteBuffer& operator<<(ByteBuffer& data, MovementInfo& movementInfo) ByteBuffer& operator>>(ByteBuffer& data, MovementInfo& movementInfo) { - bool hasSpline = false; + //bool hasSpline = false; data >> movementInfo.guid; data >> movementInfo.time; @@ -106,7 +106,7 @@ ByteBuffer& operator>>(ByteBuffer& data, MovementInfo& movementInfo) bool hasTransport = data.ReadBit(); bool hasFall = data.ReadBit(); - hasSpline = data.ReadBit(); // todo 6.x read this infos + /*hasSpline = */data.ReadBit(); // todo 6.x read this infos data.ReadBit(); // HeightChangeFailed data.ReadBit(); // RemoteTimeValid diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index b3d495f8a7e58..1e97f1b970dd2 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -162,7 +162,7 @@ namespace MMAP { while (1) { - uint32 mapId; + uint32 mapId = 0; _queue.WaitAndPop(mapId); diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index d0788569d0166..bcd60428abcb6 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -394,7 +394,6 @@ void ParsMapFiles() bool processArgv(int argc, char ** argv, const char *versionString) { bool result = true; - bool hasInputPathParam = false; preciseVectorData = false; for(int i = 1; i < argc; ++i) @@ -407,7 +406,6 @@ bool processArgv(int argc, char ** argv, const char *versionString) { if((i+1)