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

Migrate tasks [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-03-11 03:31:06 -05:00
parent 0d270fdac7
commit b3e4d90e4f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/tasks.cpp
View File

@ -69,7 +69,7 @@ bool TaskManager::LoadTaskSets()
"ORDER BY `id`, `taskid` ASC", "ORDER BY `id`, `taskid` ASC",
MAXTASKSETS, MAXTASKS MAXTASKSETS, MAXTASKS
); );
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
LogError("Error in TaskManager::LoadTaskSets: [{}]", results.ErrorMessage().c_str()); LogError("Error in TaskManager::LoadTaskSets: [{}]", results.ErrorMessage().c_str());
return false; return false;
@ -131,7 +131,7 @@ bool TaskManager::LoadTasks(int singleTask)
const char *ERR_MYSQLERROR = "[TASKS]Error in TaskManager::LoadTasks: %s"; const char *ERR_MYSQLERROR = "[TASKS]Error in TaskManager::LoadTasks: %s";
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str()); LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str());
return false; return false;
@ -188,7 +188,7 @@ bool TaskManager::LoadTasks(int singleTask)
"`goalcount`, `delivertonpc`, `zones`, `optional` FROM `task_activities` WHERE `taskid` = " "`goalcount`, `delivertonpc`, `zones`, `optional` FROM `task_activities` WHERE `taskid` = "
"%i AND `activityid` < %i ORDER BY taskid, activityid ASC", "%i AND `activityid` < %i ORDER BY taskid, activityid ASC",
singleTask, MAXACTIVITIESPERTASK); singleTask, MAXACTIVITIESPERTASK);
results = database.QueryDatabase(query); results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str()); LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str());
return false; return false;
@ -3349,7 +3349,7 @@ bool TaskGoalListManager::LoadLists()
std::string query = "SELECT `listid`, COUNT(`entry`) " std::string query = "SELECT `listid`, COUNT(`entry`) "
"FROM `goallists` GROUP by `listid` " "FROM `goallists` GROUP by `listid` "
"ORDER BY `listid`"; "ORDER BY `listid`";
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return false; return false;
} }
@ -3379,7 +3379,7 @@ bool TaskGoalListManager::LoadLists()
"WHERE `listid` = %i " "WHERE `listid` = %i "
"ORDER BY `entry` ASC LIMIT %i", "ORDER BY `entry` ASC LIMIT %i",
listID, size); listID, size);
results = database.QueryDatabase(query); results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
continue; continue;
} }
@ -3484,7 +3484,7 @@ bool TaskProximityManager::LoadProximities(int zoneID) {
"`miny`, `maxy`, `minz`, `maxz` " "`miny`, `maxy`, `minz`, `maxz` "
"FROM `proximities` WHERE `zoneid` = %i " "FROM `proximities` WHERE `zoneid` = %i "
"ORDER BY `zoneid` ASC", zoneID); "ORDER BY `zoneid` ASC", zoneID);
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return false; return false;
} }