aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorGustavo <sirikfoll@hotmail.com>2019-04-03 23:36:26 -0300
committerShauren <shauren.trinity@gmail.com>2021-11-26 11:18:15 +0100
commit6aaf9aaf3b72276078396d39e83cd3b605d49fb8 (patch)
treed351bac363ac24688455a8cc2932a61d342c1e52 /src/server/game
parent5aa0539d4b9e0ea83e0daf693b428d0687291777 (diff)
Core/Misc: Warning fixes (/W4) (#23149)
* Core/Misc: Warning fixes (/W4) (cherry picked from commit 50f122de778bca324d0f4c81f1e8eb30b90a7314)
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.cpp4
-rw-r--r--src/server/game/Handlers/PetHandler.cpp12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 696d12d0f17..9d18eadc1bc 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -984,8 +984,8 @@ void LFGMgr::MakeNewGroup(LfgProposal const& proposal)
if (!dungeons.empty())
{
uint32 rDungeonId = (*dungeons.begin());
- LFGDungeonData const* dungeon = GetLFGDungeon(rDungeonId);
- if (dungeon && dungeon->type == LFG_TYPE_RANDOM)
+ LFGDungeonData const* dungeonEntry = GetLFGDungeon(rDungeonId);
+ if (dungeonEntry && dungeonEntry->type == LFG_TYPE_RANDOM)
player->CastSpell(player, LFG_SPELL_DUNGEON_COOLDOWN, false);
}
}
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index 9c2490f6d6e..667d81bdca9 100644
--- a/src/server/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
@@ -643,21 +643,21 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPackets::Pet::PetSpellAutoc
if (controlled->GetEntry() == pet->GetEntry() && controlled->IsAlive())
pets.push_back(controlled);
- for (Unit* pet : pets)
+ for (Unit* petControlled : pets)
{
// do not add not learned spells/ passive spells
- if (!pet->HasSpell(packet.SpellID) || !spellInfo->IsAutocastable())
+ if (!petControlled->HasSpell(packet.SpellID) || !spellInfo->IsAutocastable())
return;
- CharmInfo* charmInfo = pet->GetCharmInfo();
+ CharmInfo* charmInfo = petControlled->GetCharmInfo();
if (!charmInfo)
{
- TC_LOG_ERROR("entities.pet", "WorldSession::HandlePetSpellAutocastOpcode: object (%s) is considered pet-like but doesn't have a charminfo!", pet->GetGUID().ToString().c_str());
+ TC_LOG_ERROR("entities.pet", "WorldSession::HandlePetSpellAutocastOpcode: object (%s) is considered pet-like but doesn't have a charminfo!", petControlled->GetGUID().ToString().c_str());
return;
}
- if (pet->IsPet())
- pet->ToPet()->ToggleAutocast(spellInfo, packet.AutocastEnabled);
+ if (petControlled->IsPet())
+ petControlled->ToPet()->ToggleAutocast(spellInfo, packet.AutocastEnabled);
else
charmInfo->ToggleCreatureAutocast(spellInfo, packet.AutocastEnabled);