Fix some static analysis issues.

src/game/AccountMgr.cpp

@@ -306,7 +306,7 @@ bool AccountMgr::normalizeString(std::string& utf8str)
     return WStrToUtf8(wstr_buf, utf8str);
 }
 
-std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& password)
+std::string AccountMgr::CalculateShaPassHash(std::string const& name, std::string const& password)
 {
     auto pwHash = Crypto::Hash::SHA1::ComputeFrom(name + ":" + password);
 

src/game/AccountMgr.h

@@ -94,7 +94,7 @@ class AccountMgr
         AccountOpResult ChangeUsername(uint32 accid, std::string new_uname, std::string new_passwd);
         AccountOpResult ChangePassword(uint32 accid, std::string new_passwd, std::string username="");
         bool CheckPassword(uint32 accid, std::string passwd, std::string username="");
-        std::string CalculateShaPassHash(std::string& name, std::string& password);
+        std::string CalculateShaPassHash(std::string const& name, std::string const& password);
 
         void Load();
         void LoadAccountData();

src/game/Battlegrounds/BattleGround.cpp

@@ -785,9 +785,9 @@ void BattleGround::RewardMark(Player* pPlayer, bool winner)
         return;
 
     if (winner)
-        RewardSpellCast(pPlayer, pPlayer->GetTeamId() ? GetHordeWinSpell() : GetAllianceWinSpell());
+        RewardSpellCast(pPlayer, pPlayer->GetTeamId() == TEAM_HORDE ? GetHordeWinSpell() : GetAllianceWinSpell());
     else
-        RewardSpellCast(pPlayer, pPlayer->GetTeamId() ? GetHordeLoseSpell() : GetAllianceLoseSpell());
+        RewardSpellCast(pPlayer, pPlayer->GetTeamId() == TEAM_HORDE ? GetHordeLoseSpell() : GetAllianceLoseSpell());
 }
 
 void BattleGround::RewardSpellCast(Player* pPlayer, uint32 spellId)

src/game/Battlegrounds/BattleGroundMgr.h

@@ -87,7 +87,7 @@ class BattleGroundQueue
         void Update(BattleGroundTypeId bgTypeId, BattleGroundBracketId bracketId);
 
         void FillPlayersToBg(BattleGround* bg, BattleGroundBracketId bracketId);
-        bool CheckPremadeMatch(BattleGroundBracketId bracketId, uint32 maxPlayersPerTeam, uint32 minPlayersPerTeam);
+        bool CheckPremadeMatch(BattleGroundBracketId bracketId, uint32 minPlayersPerTeam, uint32 maxPlayersPerTeam);
         bool CheckNormalMatch(BattleGroundBracketId bracketId, uint32 minPlayers, uint32 maxPlayers);
         GroupQueueInfo* AddGroup(Player* leader, Group* group, BattleGroundTypeId bgTypeId, BattleGroundBracketId bracketId, bool isPremade, uint32 instanceId, std::vector<uint32>* excludedMembers);
         void RemovePlayer(ObjectGuid guid, bool decreaseInvitedCount);

src/game/Commands/CharacterCommands.cpp

@@ -4295,7 +4295,7 @@ bool ChatHandler::HandleModifyGenderCommand(char *args)
     // Change display ID
     player->InitPlayerDisplayIds();
 
-    char const* gender_full = gender ? "female" : "male";
+    char const* gender_full = gender == GENDER_FEMALE ? "female" : "male";
 
     PSendSysMessage(LANG_YOU_CHANGE_GENDER, player->GetName(), gender_full);
 

src/game/Commands/TeleportCommands.cpp

@@ -1082,11 +1082,11 @@ bool ChatHandler::HandleUnstuckCommand(char* /*args*/)
         if (SpellEntry const* pSpellEntry= sSpellMgr.GetSpellEntry(20939))
             pPlayer->AddCooldown(*pSpellEntry, nullptr, false, HOUR * IN_MILLISECONDS); // Trigger 1 Hour Cooldown
         // Get nearest graveyard.
-        WorldSafeLocsEntry const* ClosestGrave = sObjectMgr.GetClosestGraveYard(pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), pPlayer->GetMapId(), pPlayer->GetTeam());
-        if (!ClosestGrave) //No nearby graveyards (stuck in void?). Send ally to Westfall, Horde to Barrens.
-            ClosestGrave = pPlayer->GetTeamId() ? sWorldSafeLocsStore.LookupEntry(10) : sWorldSafeLocsStore.LookupEntry(4);
-        if (ClosestGrave)
-            pPlayer->TeleportTo(ClosestGrave->map_id, ClosestGrave->x, ClosestGrave->y, ClosestGrave->z, sObjectMgr.GetWorldSafeLocFacing(ClosestGrave->ID), 0);
+        WorldSafeLocsEntry const* pClosestGrave = sObjectMgr.GetClosestGraveYard(pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), pPlayer->GetMapId(), pPlayer->GetTeam());
+        if (!pClosestGrave) // No nearby graveyards (stuck in void?). Send ally to Westfall, Horde to Barrens.
+            pClosestGrave = pPlayer->GetTeamId() == TEAM_HORDE ? sWorldSafeLocsStore.LookupEntry(10) : sWorldSafeLocsStore.LookupEntry(4);
+        if (pClosestGrave)
+            pPlayer->TeleportTo(pClosestGrave->map_id, pClosestGrave->x, pClosestGrave->y, pClosestGrave->z, sObjectMgr.GetWorldSafeLocFacing(pClosestGrave->ID), 0);
         SendSysMessage(LANG_UNSTUCK_DEAD);
     }
 

src/game/CreatureGroups.cpp

@@ -165,7 +165,7 @@ void CreatureGroup::OnRespawn(Creature* member)
     RespawnAll(member);
 }
 
-void CreatureGroup::RespawnAll(Creature* except)
+void CreatureGroup::RespawnAll(Creature const* except)
 {
     if (m_deleted)
         return;
@@ -217,7 +217,7 @@ void CreatureGroup::Respawn(Creature* member, CreatureGroupMember const* memberE
     m_respawnGuard = false;
 }
 
-void CreatureGroup::MemberAssist(Creature* member, Unit* target, Creature* alliedAttacker)
+void CreatureGroup::MemberAssist(Creature* member, Unit* target, Creature const* alliedAttacker)
 {
     if (m_assistGuard)
         return;
@@ -242,7 +242,7 @@ void CreatureGroup::MemberAssist(Creature* member, Unit* target, Creature* allie
     }
 }
 
-void CreatureGroup::RemoveTemporaryLeader(Creature* pLeader)
+void CreatureGroup::RemoveTemporaryLeader(Creature const* pLeader)
 {
     if (m_deleted)
         return;

src/game/CreatureGroups.h

@@ -63,7 +63,7 @@ class CreatureGroup
         }
         void AddMember(ObjectGuid guid, float followDist, float followAngle, uint32 memberFlags = (OPTION_FORMATION_MOVE|OPTION_AGGRO_TOGETHER));
         void RemoveMember(ObjectGuid guid);
-        void RemoveTemporaryLeader(Creature* pLeader);
+        void RemoveTemporaryLeader(Creature const* pLeader);
         void DisbandGroup(Creature* pLeader);
         void DeleteFromDb();
         void SaveToDb();
@@ -82,10 +82,10 @@ class CreatureGroup
         void OnMemberDied(Creature* member);
         void OnLeaveCombat(Creature* creature);
         void OnRespawn(Creature* member);
-        void RespawnAll(Creature* except);
+        void RespawnAll(Creature const* except);
     protected:
         void Respawn(Creature* member, CreatureGroupMember const* memberEntry);
-        void MemberAssist(Creature* member, Unit* target, Creature* alliedAttacker);
+        void MemberAssist(Creature* member, Unit* target, Creature const* alliedAttacker);
         ObjectGuid m_leaderGuid;
         ObjectGuid m_originalLeaderGuid;
         uint32 m_options;

src/game/GMTicketMgr.cpp

@@ -443,7 +443,7 @@ void TicketMgr::ShowEscalatedList(ChatHandler& handler) const
             handler.PSendSysMessage(LANG_COMMAND_TICKETESCALATED_TICKET, itr.second->FormatMessageString(handler).c_str(), itr.second->GetNeededSecurityLevel());
 }
 
-void TicketMgr::SendTicket(WorldSession* session, GmTicket* ticket) const
+void TicketMgr::SendTicket(WorldSession* session, GmTicket const* ticket) const
 {
     WorldPacket data(SMSG_GMTICKET_GETTICKET, (ticket ? (4 + 4 + 1 + 4 + 4 + 4 + 1 + 1) : 4));
 

src/game/GMTicketMgr.h

@@ -261,7 +261,7 @@ class TicketMgr
     void ShowClosedList(ChatHandler& handler) const;
     void ShowEscalatedList(ChatHandler& handler) const;
 
-    void SendTicket(WorldSession* session, GmTicket* ticket) const;
+    void SendTicket(WorldSession* session, GmTicket const* ticket) const;
     void ReloadTicket(uint32 ticketId);
     void ReloadTicketCallback(std::unique_ptr<QueryResult> result);
 

src/game/GossipDef.h

@@ -198,11 +198,11 @@ class GossipMenu
         void AddMenuItem(uint8 Icon, int32 itemText, uint32 dtSender, uint32 dtAction, int32 boxText = 0, bool Coded = false);
 
         void SetMenuId(uint32 menu_id) { m_gMenuId = menu_id; }
-        uint32 GetMenuId() { return m_gMenuId; }
+        uint32 GetMenuId() const { return m_gMenuId; }
 
         // used to avoid opening gossip menu at node discover
         void SetDiscoveredNode() { m_discoveredNode = true; }
-        bool IsJustDiscoveredNode() { return m_discoveredNode; }
+        bool IsJustDiscoveredNode() const { return m_discoveredNode; }
 
         void AddGossipMenuItemData(int32 action_menu, uint32 action_poi, uint32 action_script);
 

src/game/HardcodedEvents.cpp

@@ -248,9 +248,9 @@ void DragonsOfNightmare::CheckSingleVariable(uint32 idx, uint32& value)
     }
 }
 
-void DragonsOfNightmare::GetAliveCountAndUpdateRespawnTime(std::vector<ObjectGuid>& dragons, uint32& alive, time_t respawnTime)
+void DragonsOfNightmare::GetAliveCountAndUpdateRespawnTime(std::vector<ObjectGuid> const& dragons, uint32& alive, time_t respawnTime)
 {
-    for (auto& guid : dragons)
+    for (auto const& guid : dragons)
     {
         auto cData = sObjectMgr.GetCreatureData(guid.GetCounter());
 
@@ -610,7 +610,7 @@ void ScourgeInvasionEvent::LogNextZoneTime()
     time_t now = time(nullptr);
     uint32 timer = 0;
     uint32 zoneid = 0;
-    std::vector<uint32> validZones;
+
     for (const auto& invasionPoint : invasionPoints)
     {
         if (invasionPoint.zoneId == sObjectMgr.GetSavedVariable(VARIABLE_SI_LAST_ATTACK_ZONE))

src/game/HardcodedEvents.h

@@ -87,7 +87,7 @@ struct DragonsOfNightmare : WorldEvent
     static void CheckSingleVariable(uint32 idx, uint32& value);
 
 private:
-    void GetAliveCountAndUpdateRespawnTime(std::vector<ObjectGuid>& dragons, uint32& alive, time_t respawnTime);
+    void GetAliveCountAndUpdateRespawnTime(std::vector<ObjectGuid> const& dragons, uint32& alive, time_t respawnTime);
     bool LoadDragons(std::vector<ObjectGuid>& dragonGUIDs);
     //void GetExistingDragons(std::vector<ObjectGuid>& dragonGUIDs, std::vector<Creature*>& existingDragons);
     void PermutateDragons();

src/game/HonorMgr.cpp

@@ -31,10 +31,10 @@ HonorStandingList& HonorMaintenancer::GetStandingListByTeam(Team team)
     }
 }
 
-float HonorMaintenancer::GetStandingCPByPosition(HonorStandingList& standingList, uint32 position)
+float HonorMaintenancer::GetStandingCPByPosition(HonorStandingList const& standingList, uint32 position)
 {
     uint32 pos = 1;
-    for (auto& standing : standingList)
+    for (auto const& standing : standingList)
     {
         if (pos == position)
             return standing.cp;

src/game/HonorMgr.h

@@ -69,7 +69,7 @@ class HonorMaintenancer
         void SetCityRanks();
         void CreateCalculationReport();
 
-        float GetStandingCPByPosition(HonorStandingList& standingList, uint32 position);
+        float GetStandingCPByPosition(HonorStandingList const& standingList, uint32 position);
         uint32 GetStandingPositionByGUID(uint32 guid, Team team);
         HonorStandingList& GetStandingListByTeam(Team team);
         HonorScores GenerateScores(HonorStandingList& standingList);

src/game/ItemEnchantmentMgr.cpp

@@ -51,7 +51,6 @@ void LoadRandomEnchantmentsTable()
 {
     RandomItemEnch.clear();                                 // for reload case
 
-    EnchantmentStore::const_iterator tab;
     uint32 entry, ench;
     uint32 count = 0;
 

src/game/LootMgr.cpp

@@ -439,7 +439,7 @@ bool LootStoreItem::AllowedForTeam(Loot const& loot) const
     return true;
 }
 
-LootSlotType LootItem::GetSlotTypeForSharedLoot(PermissionTypes permission, Player* viewer, WorldObject const* lootTarget, bool condition_ok /*= false*/) const
+LootSlotType LootItem::GetSlotTypeForSharedLoot(PermissionTypes permission, Player const* viewer, WorldObject const* lootTarget, bool condition_ok /*= false*/) const
 {
     // ignore looted, FFA (each player get own copy) and not allowed items
     if (is_looted || freeforall || (conditionId && !condition_ok) || !AllowedForPlayer(viewer, lootTarget))
@@ -574,7 +574,7 @@ void Loot::FillNotNormalLootFor(Player* pl)
         FillNonQuestNonFFAConditionalLoot(pl);
 }
 
-QuestItemList* Loot::FillFFALoot(Player* player)
+QuestItemList* Loot::FillFFALoot(Player const* player)
 {
     if (!player->IsInWorld())
         return nullptr;
@@ -600,7 +600,7 @@ QuestItemList* Loot::FillFFALoot(Player* player)
     return ql;
 }
 
-QuestItemList* Loot::FillQuestLoot(Player* player)
+QuestItemList* Loot::FillQuestLoot(Player const* player)
 {
     if (!player->IsInWorld())
         return nullptr;
@@ -638,7 +638,7 @@ QuestItemList* Loot::FillQuestLoot(Player* player)
     return ql;
 }
 
-QuestItemList* Loot::FillNonQuestNonFFAConditionalLoot(Player* player)
+QuestItemList* Loot::FillNonQuestNonFFAConditionalLoot(Player const* player)
 {
     if (!player->IsInWorld())
         return nullptr;
@@ -1028,7 +1028,7 @@ bool Loot::hasOverThresholdItem() const
 }
 
 // return true if there is any FFA, quest or conditional item for the player.
-bool Loot::hasItemFor(Player* player) const
+bool Loot::hasItemFor(Player const* player) const
 {
     QuestItemMap const& lootPlayerQuestItems = GetPlayerQuestItems();
     QuestItemMap::const_iterator q_itr = lootPlayerQuestItems.find(player->GetGUIDLow());

src/game/LootMgr.h

@@ -150,7 +150,7 @@ struct LootItem
 
     // Basic checks for player/item compatibility - if false no chance to see the item in the loot
     bool AllowedForPlayer(Player const* player, WorldObject const* lootTarget) const;
-    LootSlotType GetSlotTypeForSharedLoot(PermissionTypes permission, Player* viewer, WorldObject const* lootTarget, bool condition_ok = false) const;
+    LootSlotType GetSlotTypeForSharedLoot(PermissionTypes permission, Player const* viewer, WorldObject const* lootTarget, bool condition_ok = false) const;
 };
 
 typedef std::vector<LootItem> LootItemList;
@@ -362,7 +362,7 @@ struct Loot
     WorldObject const* GetLootTarget() const;
 
     // TrinityCore
-    bool hasItemFor(Player* player) const;
+    bool hasItemFor(Player const* player) const;
     bool hasOverThresholdItem() const;
     bool IsAllowedLooter(ObjectGuid guid, bool doPersonalCheck = true) const;
     bool IsOriginalLooter(ObjectGuid guid) const { return IsAllowedLooter(guid, false); }
@@ -377,9 +377,9 @@ struct Loot
     QuestItemMap m_playerFFAItems;
     QuestItemMap m_playerNonQuestNonFFAConditionalItems;
     private:
-        QuestItemList* FillFFALoot(Player* player);
-        QuestItemList* FillQuestLoot(Player* player);
-        QuestItemList* FillNonQuestNonFFAConditionalLoot(Player* player);
+        QuestItemList* FillFFALoot(Player const* player);
+        QuestItemList* FillQuestLoot(Player const* player);
+        QuestItemList* FillNonQuestNonFFAConditionalLoot(Player const* player);
 
         typedef std::set<ObjectGuid> PlayersLooting;
         PlayersLooting m_playersLooting;

src/game/Maps/Map.h

@@ -244,23 +244,23 @@ struct ScriptedEvent
 
     void SendEventToAllTargets(uint32 uiData);
 
-    void SetSourceObject(WorldObject* pSource)
+    void SetSourceObject(WorldObject const* pSource)
     {
         if (pSource && pSource->IsInWorld() && (pSource->GetMap() == &m_Map))
         {
             m_Source = pSource->GetObjectGuid();
         }
     }
 
-    void SetTargetObject(WorldObject* pTarget)
+    void SetTargetObject(WorldObject const* pTarget)
     {
         if (pTarget && pTarget->IsInWorld() && (pTarget->GetMap() == &m_Map))
         {
             m_Target = pTarget->GetObjectGuid();
         }
     }
 
-    void AddOrUpdateExtraTarget(WorldObject* pObject, uint32 failureCondition, uint32 failureScript, uint32 successCondition, uint32 successScript)
+    void AddOrUpdateExtraTarget(WorldObject const* pObject, uint32 failureCondition, uint32 failureScript, uint32 successCondition, uint32 successScript)
     {
         if (!pObject || !pObject->IsInWorld() || (pObject->GetMap() != &m_Map))
             return;

src/game/ObjectAccessor.cpp

@@ -49,8 +49,7 @@ ObjectAccessor::~ObjectAccessor()
     }
 }
 
-Unit*
-ObjectAccessor::GetUnit(WorldObject const& u, ObjectGuid guid)
+Unit* ObjectAccessor::GetUnit(WorldObject const& u, ObjectGuid guid)
 {
     if (!guid)
         return nullptr;
@@ -156,8 +155,7 @@ PlayerPointer ObjectAccessor::FindPlayerPointer(char const* name)
     return PlayerPointer(nullptr);
 }
 
-void
-ObjectAccessor::SaveAllPlayers()
+void ObjectAccessor::SaveAllPlayers()
 {
     HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock());
     HashMapHolder<Player>::MapType& m = sObjectAccessor.GetPlayers();
@@ -175,8 +173,7 @@ void ObjectAccessor::KickPlayer(ObjectGuid guid)
     }
 }
 
-Corpse*
-ObjectAccessor::GetCorpseForPlayerGUID(ObjectGuid guid)
+Corpse* ObjectAccessor::GetCorpseForPlayerGUID(ObjectGuid guid)
 {
     ASSERT(guid.IsPlayer());
 
@@ -191,8 +188,7 @@ ObjectAccessor::GetCorpseForPlayerGUID(ObjectGuid guid)
     return iter->second;
 }
 
-void
-ObjectAccessor::RemoveCorpse(Corpse* corpse)
+void ObjectAccessor::RemoveCorpse(Corpse* corpse)
 {
     MANGOS_ASSERT(corpse && corpse->GetType() != CORPSE_BONES);
 
@@ -211,8 +207,7 @@ ObjectAccessor::RemoveCorpse(Corpse* corpse)
     i_player2corpse.erase(iter);
 }
 
-void
-ObjectAccessor::AddCorpse(Corpse* corpse)
+void ObjectAccessor::AddCorpse(Corpse* corpse)
 {
     MANGOS_ASSERT(corpse && corpse->GetType() != CORPSE_BONES);
 
@@ -227,8 +222,7 @@ ObjectAccessor::AddCorpse(Corpse* corpse)
     sObjectMgr.AddCorpseCellData(corpse->GetMapId(), cell_id, corpse->GetOwnerGuid().GetCounter(), corpse->GetInstanceId());
 }
 
-void
-ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair, GridType& grid, Map* map)
+void ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair, GridType& grid, Map const* map)
 {
     Guard guard(i_corpseGuard);
     for (const auto& iter : i_player2corpse)
@@ -250,7 +244,7 @@ ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair, GridType& grid, Map*
     }
 }
 
-void ObjectAccessor::ConvertCorpseForPlayer(ObjectGuid player_guid, Player* looter)
+void ObjectAccessor::ConvertCorpseForPlayer(ObjectGuid player_guid, Player const* looter)
 {
     ASSERT(player_guid.IsPlayer());
 

src/game/ObjectAccessor.h

@@ -137,8 +137,8 @@ class ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLev
         static Corpse* GetCorpseInMap(ObjectGuid guid, uint32 mapid);
         void RemoveCorpse(Corpse* corpse);
         void AddCorpse(Corpse* corpse);
-        void AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* map);
-        void ConvertCorpseForPlayer(ObjectGuid player_guid, Player* looter = nullptr);
+        void AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map const* map);
+        void ConvertCorpseForPlayer(ObjectGuid player_guid, Player const* looter = nullptr);
         void RemoveOldCorpses();
 
         // For call from Player/Corpse AddToWorld/RemoveFromWorld only