From 65fd323eab824492fffb97719345e5a68e5fe887 Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Wed, 24 May 2023 23:42:20 -0400 Subject: [PATCH] [Cleanup] Remove LoadSpawn2() and PopulateZoneSpawnListClose() from spawn2.cpp/zonedb.h (#3344) # Notes - These are unused. --- zone/spawn2.cpp | 139 ------------------------------------------------ zone/zonedb.h | 2 - 2 files changed, 141 deletions(-) diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index 0334f4e1f..42354603d 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -429,114 +429,6 @@ void Spawn2::DeathReset(bool realdeath) } } -bool ZoneDatabase::PopulateZoneSpawnListClose(uint32 zoneid, LinkedList &spawn2_list, int16 version, const glm::vec4& client_position, uint32 repop_distance) -{ - std::unordered_map spawn_times; - - float mob_distance = 0; - - timeval tv; - gettimeofday(&tv, nullptr); - - /* Bulk Load NPC Types Data into the cache */ - content_db.LoadNPCTypesData(0, true); - - std::string spawn_query = StringFormat( - "SELECT " - "respawn_times.id, " - "respawn_times.`start`, " - "respawn_times.duration " - "FROM " - "respawn_times " - "WHERE instance_id = %u", - zone->GetInstanceID() - ); - auto results = QueryDatabase(spawn_query); - for (auto row = results.begin(); row != results.end(); ++row) { - uint32 start_duration = Strings::ToInt(row[1]) > 0 ? Strings::ToInt(row[1]) : 0; - uint32 end_duration = Strings::ToInt(row[2]) > 0 ? Strings::ToInt(row[2]) : 0; - - /* Our current time was expired */ - if ((start_duration + end_duration) <= tv.tv_sec) { - spawn_times[Strings::ToInt(row[0])] = 0; - } - /* We still have time left on this timer */ - else { - spawn_times[Strings::ToInt(row[0])] = ((start_duration + end_duration) - tv.tv_sec) * 1000; - } - } - - const char *zone_name = ZoneName(zoneid); - std::string query = StringFormat( - "SELECT " - "id, " - "spawngroupID, " - "x, " - "y, " - "z, " - "heading, " - "respawntime, " - "variance, " - "pathgrid, " - "path_when_zone_idle, " - "_condition, " - "cond_value, " - "enabled, " - "animation " - "FROM " - "spawn2 " - "WHERE zone = '%s' AND (version = %u OR version = -1) ", - zone_name, - version - ); - results = database.QueryDatabase(query); - - if (!results.Success()) { - return false; - } - - for (auto row = results.begin(); row != results.end(); ++row) { - - uint32 spawn_time_left = 0; - Spawn2* new_spawn = 0; - bool perl_enabled = Strings::ToInt(row[12]) == 1 ? true : false; - - if (spawn_times.count(Strings::ToInt(row[0])) != 0) - spawn_time_left = spawn_times[Strings::ToInt(row[0])]; - - glm::vec4 point; - point.x = Strings::ToFloat(row[2]); - point.y = Strings::ToFloat(row[3]); - - mob_distance = DistanceNoZ(client_position, point); - - if (mob_distance > repop_distance) - continue; - - new_spawn = new Spawn2( - Strings::ToInt(row[0]), // uint32 in_spawn2_id - Strings::ToInt(row[1]), // uint32 spawngroup_id - Strings::ToFloat(row[2]), // float in_x - Strings::ToFloat(row[3]), // float in_y - Strings::ToFloat(row[4]), // float in_z - Strings::ToFloat(row[5]), // float in_heading - Strings::ToInt(row[6]), // uint32 respawn - Strings::ToInt(row[7]), // uint32 variance - spawn_time_left, // uint32 timeleft - Strings::ToInt(row[8]), // uint32 grid - (bool)Strings::ToInt(row[9]), // bool path_when_zone_idle - Strings::ToInt(row[10]), // uint16 in_cond_id - Strings::ToInt(row[11]), // int16 in_min_value - perl_enabled, // bool in_enabled - (EmuAppearance)Strings::ToInt(row[13]) // EmuAppearance anim - ); - - spawn2_list.Insert(new_spawn); - } - - return true; -} - bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList &spawn2_list, int16 version) { std::unordered_map spawn_times; @@ -640,37 +532,6 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList &spa return true; } - -Spawn2* ZoneDatabase::LoadSpawn2(LinkedList &spawn2_list, uint32 spawn2id, uint32 timeleft) { - - std::string query = StringFormat("SELECT id, spawngroupID, x, y, z, heading, " - "respawntime, variance, pathgrid, " - "path_when_zone_idle, _condition, " - "cond_value, enabled, animation FROM spawn2 " - "WHERE id = %i", spawn2id); - auto results = QueryDatabase(query); - if (!results.Success()) { - return nullptr; - } - - if (results.RowCount() != 1) { - return nullptr; - } - - auto row = results.begin(); - - bool perl_enabled = Strings::ToInt(row[12]) == 1 ? true : false; - - auto newSpawn = new Spawn2(Strings::ToInt(row[0]), Strings::ToInt(row[1]), Strings::ToFloat(row[2]), - Strings::ToFloat(row[3]), Strings::ToFloat(row[4]), Strings::ToFloat(row[5]), Strings::ToInt(row[6]), Strings::ToInt(row[7]), - timeleft, Strings::ToInt(row[8]), (bool) Strings::ToInt(row[9]), Strings::ToInt(row[10]), - Strings::ToInt(row[11]), perl_enabled, (EmuAppearance)Strings::ToInt(row[13])); - - spawn2_list.Insert(newSpawn); - - return newSpawn; -} - bool ZoneDatabase::CreateSpawn2(Client *client, uint32 spawngroup, const char* zone, const glm::vec4& position, uint32 respawn, uint32 variance, uint16 condition, int16 cond_value) { diff --git a/zone/zonedb.h b/zone/zonedb.h index c39e75e4b..783e12a30 100644 --- a/zone/zonedb.h +++ b/zone/zonedb.h @@ -527,8 +527,6 @@ public: bool LoadSpawnGroups(const char* zone_name, uint16 version, SpawnGroupList* spawn_group_list); bool LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList* spawn_group_list); bool PopulateZoneSpawnList(uint32 zoneid, LinkedList &spawn2_list, int16 version); - bool PopulateZoneSpawnListClose(uint32 zoneid, LinkedList &spawn2_list, int16 version, const glm::vec4& client_position, uint32 repop_distance); - Spawn2* LoadSpawn2(LinkedList &spawn2_list, uint32 spawn2id, uint32 timeleft); bool CreateSpawn2(Client *c, uint32 spawngroup, const char* zone, const glm::vec4& position, uint32 respawn, uint32 variance, uint16 condition, int16 cond_value); void UpdateRespawnTime(uint32 id, uint16 instance_id,uint32 timeleft); uint32 GetSpawnTimeLeft(uint32 id, uint16 instance_id);