diff --git a/zone/entity.cpp b/zone/entity.cpp index 12725a3d6..7472c1d08 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -1756,21 +1756,6 @@ void EntityList::QueueClients( } } -void EntityList::QueueManaged(Mob *sender, const EQApplicationPacket *app, - bool ignore_sender, bool ackreq) -{ - auto it = client_list.begin(); - while (it != client_list.end()) { - Client *ent = it->second; - - if ((!ignore_sender || ent != sender)) - ent->QueuePacket(app, ackreq, Client::CLIENT_CONNECTED); - - ++it; - } -} - - void EntityList::QueueClientsStatus(Mob *sender, const EQApplicationPacket *app, bool ignore_sender, uint8 minstatus, uint8 maxstatus) { @@ -3205,21 +3190,6 @@ void EntityList::Process() CheckSpawnQueue(); } -void EntityList::CountNPC(uint32 *NPCCount, uint32 *NPCLootCount, uint32 *gmspawntype_count) -{ - *NPCCount = 0; - *NPCLootCount = 0; - - auto it = npc_list.begin(); - while (it != npc_list.end()) { - (*NPCCount)++; - (*NPCLootCount) += it->second->CountLoot(); - if (it->second->GetNPCTypeID() == 0) - (*gmspawntype_count)++; - ++it; - } -} - void EntityList::Depop(bool StartSpawnTimer) { for (auto it = npc_list.begin(); it != npc_list.end(); ++it) { diff --git a/zone/entity.h b/zone/entity.h index 079a33a0a..a5b52efe6 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -428,7 +428,6 @@ public: void QueueClientsByXTarget(Mob* sender, const EQApplicationPacket* app, bool iSendToSender = true, EQ::versions::ClientVersionBitmask client_version_bits = EQ::versions::ClientVersionBitmask::maskAllClients); void QueueToGroupsForNPCHealthAA(Mob* sender, const EQApplicationPacket* app); - void QueueManaged(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, bool ackreq = true); void AEAttack( Mob *attacker, @@ -455,13 +454,11 @@ public: Trap* FindNearbyTrap(Mob* searcher, float max_dist, float &curdist, bool detected = false); void AddHealAggro(Mob* target, Mob* caster, uint16 hate); - Mob* FindDefenseNPC(uint32 npcid); void OpenDoorsNear(Mob* opener); void UpdateWho(bool iSendFullUpdate = false); char* MakeNameUnique(char* name); static char* RemoveNumbers(char* name); void SignalMobsByNPCID(uint32 npc_type, int signal_id); - void CountNPC(uint32* NPCCount, uint32* NPCLootCount, uint32* gmspawntype_count); void RemoveEntity(uint16 id); void SendPetitionToAdmins(Petition* pet); void SendPetitionToAdmins();