pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-18 12:28:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Decouple temporary merchant list call [skip ci]

Browse Source
This commit is contained in:
Akkadius
2020-03-30 21:32:59 -05:00
parent 43716332aa
commit 79dbddd56e
7 changed files with 115 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spawn2.cpp
+3 -3
View File
@@ -480,7 +480,7 @@ bool ZoneDatabase::PopulateZoneSpawnListClose(uint32 zoneid, LinkedList<Spawn2*>
zone_name,
version
);
results = QueryDatabase(query);
results = database.QueryDatabase(query);
if (!results.Success()) {
return false;
@@ -547,7 +547,7 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
"WHERE instance_id = %u",
zone->GetInstanceID()
);
auto results = QueryDatabase(spawn_query);
auto results = database.QueryDatabase(spawn_query);
for (auto row = results.begin(); row != results.end(); ++row) {
uint32 start_duration = atoi(row[1]) > 0 ? atoi(row[1]) : 0;
uint32 end_duration = atoi(row[2]) > 0 ? atoi(row[2]) : 0;
@@ -989,7 +989,7 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in
query = StringFormat("SELECT id, value FROM spawn_condition_values "
"WHERE zone = '%s' AND instance_id = %u",
zone_name, instance_id);
results = content_db.QueryDatabase(query);
results = database.QueryDatabase(query);
if (!results.Success()) {
spawn_conditions.clear();
return false;