aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarbenium <carbenium@outlook.com>2015-11-28 01:02:13 +0100
committerCarbenium <carbenium@outlook.com>2015-11-28 01:02:13 +0100
commitc0c4ed7135482042a81d9e8e5f2435301771b00b (patch)
tree49e5f966cfb3c415c9e32c9e9efdb86e4aac4625 /src
parentd03ca37f10e74ec7fe5d06957d66574b0fe14af2 (diff)
Misc: Fix some warnings reported by GCC 4.9
Diffstat (limited to 'src')
-rw-r--r--src/server/game/BattlePets/BattlePetMgr.cpp2
-rw-r--r--src/server/game/Handlers/NPCHandler.cpp4
-rw-r--r--src/server/game/Server/Packets/MovementPackets.cpp4
-rw-r--r--src/tools/mmaps_generator/MapBuilder.cpp2
-rw-r--r--src/tools/vmap4_extractor/vmapexport.cpp2
5 files changed, 4 insertions, 10 deletions
diff --git a/src/server/game/BattlePets/BattlePetMgr.cpp b/src/server/game/BattlePets/BattlePetMgr.cpp
index c8d26781097..925e9c71903 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 a6e192521f4..001f6cbeff0 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 33f67842bfe..8b511fb3ea5 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 b3d495f8a7e..1e97f1b970d 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 d0788569d01..bcd60428abc 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)<argc)
{
- hasInputPathParam = true;
strncpy(input_path, argv[i + 1], sizeof(input_path));
input_path[sizeof(input_path) - 1] = '\0';