From 307c1ab09dc04aeed356254744854f0cb4771bf3 Mon Sep 17 00:00:00 2001 From: sudlud Date: Wed, 13 Mar 2024 10:52:43 +0100 Subject: [PATCH] refactor(Core): remove some unused variables (#18538) - let's get rid of some compiler warnings --- src/server/game/Entities/Creature/GossipDef.cpp | 2 -- src/server/game/Globals/ObjectMgr.cpp | 7 ------- src/server/scripts/Kalimdor/zone_silithus.cpp | 4 ---- 3 files changed, 13 deletions(-) diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index b2969580d..1f8a350f3 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -212,11 +212,9 @@ void PlayerMenu::SendGossipMenu(uint32 titleTextId, ObjectGuid objectGUID) } data << uint32(_questMenu.GetMenuItemCount()); // max count 0x20 - uint32 count = 0; for (uint32 iI = 0; iI < _questMenu.GetMenuItemCount(); ++iI) { - ++count; QuestMenuItem const& item = _questMenu.GetItem(iI); uint32 questID = item.QuestId; if (Quest const* quest = sObjectMgr->GetQuestTemplate(questID)) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 3c001d792..12503649e 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2481,8 +2481,6 @@ void ObjectMgr::LoadGameobjects() { uint32 oldMSTime = getMSTime(); - uint32 count = 0; - // 0 1 2 3 4 5 6 QueryResult result = WorldDatabase.Query("SELECT gameobject.guid, id, map, position_x, position_y, position_z, orientation, " // 7 8 9 10 11 12 13 14 15 16 17 @@ -2642,7 +2640,6 @@ void ObjectMgr::LoadGameobjects() if (gameEvent == 0 && PoolId == 0) // if not this is to be managed by GameEvent System or Pool system AddGameobjectToGrid(guid, &data); - ++count; } while (result->NextRow()); LOG_INFO("server.loading", ">> Loaded {} Gameobjects in {} ms", (unsigned long)_gameObjectDataStore.size(), GetMSTimeDiffToNow(oldMSTime)); @@ -6343,8 +6340,6 @@ void ObjectMgr::LoadQuestGreetingsLocales() return; } - uint32 count = 0; - do { Field* fields = result->Fetch(); @@ -6379,8 +6374,6 @@ void ObjectMgr::LoadQuestGreetingsLocales() QuestGreetingLocale& data = _questGreetingLocaleStore[MAKE_PAIR32(type, id)]; AddLocaleString(fields[3].Get(), locale, data.Greeting); - - ++count; } while (result->NextRow()); LOG_INFO("server.loading", ">> Loaded {} quest greeting Locale Strings in {} ms", (uint32)_questGreetingLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime)); diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 13a2de09b..9cc56778c 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -829,7 +829,6 @@ public: if (Group* EventGroup = player->GetGroup()) { uint8 GroupMemberCount = 0; - uint8 DeadMemberCount = 0; uint8 FailedMemberCount = 0; Group::MemberSlotList const& members = EventGroup->GetMemberSlots(); @@ -845,9 +844,6 @@ public: ++FailedMemberCount; } ++GroupMemberCount; - - if (groupMember->isDead()) - ++DeadMemberCount; } if (GroupMemberCount == FailedMemberCount || !player->IsWithinDistInMap(me, EVENT_AREA_RADIUS))