Misc: Fix some warnings reported by GCC 4.9
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -162,7 +162,7 @@ namespace MMAP
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
uint32 mapId;
|
||||
uint32 mapId = 0;
|
||||
|
||||
_queue.WaitAndPop(mapId);
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user