pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some stragglers

Browse Source
This commit is contained in:
Akkadius 2020-03-12 03:15:14 -05:00
parent 3dc227e8cc
commit 06a51f555e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/adventure_manager.cpp
View File

@ -671,7 +671,7 @@ bool AdventureManager::LoadAdventureTemplates()
adventure_template adventure_template
) )
; ;
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return false; return false;
} }

2
zone/command.cpp
View File

@ -9956,7 +9956,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
} }
if (strcasecmp(sep->arg[1], "testload") == 0 && atoi(sep->arg[2])!=0) { if (strcasecmp(sep->arg[1], "testload") == 0 && atoi(sep->arg[2])!=0) {
database.LoadSpawnGroupsByID(atoi(sep->arg[2]),&zone->spawn_group_list); content_db.LoadSpawnGroupsByID(atoi(sep->arg[2]),&zone->spawn_group_list);
c->Message(Chat::White, "Group %i loaded successfully!", atoi(sep->arg[2])); c->Message(Chat::White, "Group %i loaded successfully!", atoi(sep->arg[2]));
return; return;
} }

2
zone/spawn2.cpp
View File

@ -166,7 +166,7 @@ bool Spawn2::Process() {
} }
if (spawn_group == nullptr) { if (spawn_group == nullptr) {
database.LoadSpawnGroupsByID(spawngroup_id_, &zone->spawn_group_list); content_db.LoadSpawnGroupsByID(spawngroup_id_, &zone->spawn_group_list);
spawn_group = zone->spawn_group_list.GetSpawnGroup(spawngroup_id_); spawn_group = zone->spawn_group_list.GetSpawnGroup(spawngroup_id_);
} }

2
zone/spawngroup.cpp
View File

@ -176,7 +176,7 @@ bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id)
void SpawnGroupList::ReloadSpawnGroups() void SpawnGroupList::ReloadSpawnGroups()
{ {
ClearSpawnGroups(); ClearSpawnGroups();
database.LoadSpawnGroups(zone->GetShortName(), zone->GetInstanceVersion(), &zone->spawn_group_list); content_db.LoadSpawnGroups(zone->GetShortName(), zone->GetInstanceVersion(), &zone->spawn_group_list);
} }
void SpawnGroupList::ClearSpawnGroups() void SpawnGroupList::ClearSpawnGroups()

6
zone/zone.cpp
View File

@ -937,13 +937,13 @@ bool Zone::Init(bool iStaticZone) {
} }
LogInfo("Loading spawn groups"); LogInfo("Loading spawn groups");
if (!database.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) { if (!content_db.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) {
LogError("Loading spawn groups failed"); LogError("Loading spawn groups failed");
return false; return false;
} }
LogInfo("Loading spawn2 points"); LogInfo("Loading spawn2 points");
if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion())) if (!content_db.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion()))
{ {
LogError("Loading spawn2 points failed"); LogError("Loading spawn2 points failed");
return false; return false;
@ -1607,7 +1607,7 @@ void Zone::Repop(uint32 delay)
quest_manager.ClearAllTimers(); quest_manager.ClearAllTimers();
if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion(), delay)) if (!content_db.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion(), delay))
LogDebug("Error in Zone::Repop: database.PopulateZoneSpawnList failed"); LogDebug("Error in Zone::Repop: database.PopulateZoneSpawnList failed");
initgrids_timer.Start(); initgrids_timer.Start();