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

Logs::Tradeskills to LogTradeskills and more Logs::Error to LogError

Browse Source
This commit is contained in:
Akkadius
2019-09-02 03:10:03 -05:00
parent b402e8f33d
commit ed4fc74bd4
13 changed files with 80 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/tasks.cpp
+20 -36
View File
@@ -142,8 +142,7 @@ bool TaskManager::LoadTasks(int singleTask)
if ((taskID <= 0) || (taskID >= MAXTASKS)) {
// This shouldn't happen, as the SELECT is bounded by MAXTASKS
Log(Logs::General, Logs::Error,
"[TASKS]Task ID %i out of range while loading tasks from database", taskID);
LogError("[TASKS]Task ID [{}] out of range while loading tasks from database", taskID);
continue;
}
@@ -203,16 +202,12 @@ bool TaskManager::LoadTasks(int singleTask)
if ((taskID <= 0) || (taskID >= MAXTASKS) || (activityID < 0) || (activityID >= MAXACTIVITIESPERTASK)) {
// This shouldn't happen, as the SELECT is bounded by MAXTASKS
Log(Logs::General, Logs::Error,
"[TASKS]Task or Activity ID (%i, %i) out of range while loading "
"activities from database",
taskID, activityID);
LogError("[TASKS]Task or Activity ID ([{}], [{}]) out of range while loading activities from database", taskID, activityID);
continue;
}
if (Tasks[taskID] == nullptr) {
Log(Logs::General, Logs::Error,
"[TASKS]Activity for non-existent task (%i, %i) while loading activities from database",
LogError("[TASKS]Activity for non-existent task ([{}], [{}]) while loading activities from database",
taskID, activityID);
continue;
}
@@ -230,8 +225,7 @@ bool TaskManager::LoadTasks(int singleTask)
// ERR_NOTASK errors.
// Change to (activityID != (Tasks[taskID]->ActivityCount + 1)) to index from 1
if (activityID != Tasks[taskID]->ActivityCount) {
Log(Logs::General, Logs::Error,
"[TASKS]Activities for Task %i are not sequential starting at 0. Not loading task.", taskID,
LogError("[TASKS]Activities for Task [{}] are not sequential starting at 0. Not loading task", taskID,
activityID);
Tasks[taskID] = nullptr;
continue;
@@ -470,7 +464,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
characterID);
auto results = database.QueryDatabase(query);
if (!results.Success()) {
Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load Tasks: %s",
LogError("[TASKS]Error in TaskManager::LoadClientState load Tasks: [{}]",
results.ErrorMessage().c_str());
return false;
}
@@ -481,21 +475,19 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
TaskType type = static_cast<TaskType>(atoi(row[2]));
if ((taskID < 0) || (taskID >= MAXTASKS)) {
Log(Logs::General, Logs::Error,
"[TASKS]Task ID %i out of range while loading character tasks from database", taskID);
LogError("[TASKS]Task ID [{}] out of range while loading character tasks from database", taskID);
continue;
}
auto task_info = state->GetClientTaskInfo(type, slot);
if (task_info == nullptr) {
Log(Logs::General, Logs::Error,
"[TASKS] Slot %i out of range while loading character tasks from database", slot);
LogError("[TASKS] Slot [{}] out of range while loading character tasks from database", slot);
continue;
}
if (task_info->TaskID != TASKSLOTEMPTY) {
Log(Logs::General, Logs::Error, "[TASKS] Slot %i for Task %is is already occupied.", slot,
LogError("[TASKS] Slot [{}] for Task [{}]s is already occupied", slot,
taskID);
continue;
}
@@ -529,7 +521,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
characterID);
results = database.QueryDatabase(query);
if (!results.Success()) {
Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load Activities: %s",
LogError("[TASKS]Error in TaskManager::LoadClientState load Activities: [{}]",
results.ErrorMessage().c_str());
return false;
}
@@ -537,15 +529,13 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
for (auto row = results.begin(); row != results.end(); ++row) {
int taskID = atoi(row[0]);
if ((taskID < 0) || (taskID >= MAXTASKS)) {
Log(Logs::General, Logs::Error,
"[TASKS]Task ID %i out of range while loading character activities from database", taskID);
LogError("[TASKS]Task ID [{}] out of range while loading character activities from database", taskID);
continue;
}
int activityID = atoi(row[1]);
if ((activityID < 0) || (activityID >= MAXACTIVITIESPERTASK)) {
Log(Logs::General, Logs::Error,
"[TASKS]Activity ID %i out of range while loading character activities from database",
LogError("[TASKS]Activity ID [{}] out of range while loading character activities from database",
activityID);
continue;
}
@@ -562,8 +552,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
task_info = &state->ActiveQuests[i];
if (task_info == nullptr) {
Log(Logs::General, Logs::Error,
"[TASKS]Activity %i found for task %i which client does not have.", activityID, taskID);
LogError("[TASKS]Activity [{}] found for task [{}] which client does not have", activityID, taskID);
continue;
}
@@ -591,8 +580,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
characterID);
results = database.QueryDatabase(query);
if (!results.Success()) {
Log(Logs::General, Logs::Error,
"[TASKS]Error in TaskManager::LoadClientState load completed tasks: %s",
LogError("[TASKS]Error in TaskManager::LoadClientState load completed tasks: [{}]",
results.ErrorMessage().c_str());
return false;
}
@@ -609,8 +597,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
int taskID = atoi(row[0]);
if ((taskID <= 0) || (taskID >= MAXTASKS)) {
Log(Logs::General, Logs::Error,
"[TASKS]Task ID %i out of range while loading completed tasks from database",
LogError("[TASKS]Task ID [{}] out of range while loading completed tasks from database",
taskID);
continue;
}
@@ -621,8 +608,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
// completed.
int activityID = atoi(row[1]);
if ((activityID < -1) || (activityID >= MAXACTIVITIESPERTASK)) {
Log(Logs::General, Logs::Error,
"[TASKS]Activity ID %i out of range while loading completed tasks from database",
LogError("[TASKS]Activity ID [{}] out of range while loading completed tasks from database",
activityID);
continue;
}
@@ -663,7 +649,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
characterID, MAXTASKS);
results = database.QueryDatabase(query);
if (!results.Success()) {
Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load enabled tasks: %s",
LogError("[TASKS]Error in TaskManager::LoadClientState load enabled tasks: [{}]",
results.ErrorMessage().c_str());
} else {
for (auto row = results.begin(); row != results.end(); ++row) {
@@ -686,7 +672,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
"Removing from memory. Contact a GM to resolve this.",
i, taskID);
Log(Logs::General, Logs::Error, "[TASKS]Character %i has task %i which does not exist.",
LogError("[TASKS]Character [{}] has task [{}] which does not exist",
characterID, taskID);
state->ActiveTasks[i].TaskID = TASKSLOTEMPTY;
continue;
@@ -699,9 +685,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
"Removing from memory. Contact a GM to resolve this.",
taskID, Tasks[taskID]->Title.c_str());
Log(Logs::General, Logs::Error,
"[TASKS]Fatal error in character %i task state. Activity %i for "
"Task %i either missing from client state or from task.",
LogError("[TASKS]Fatal error in character [{}] task state. Activity [{}] for Task [{}] either missing from client state or from task",
characterID, j, taskID);
state->ActiveTasks[i].TaskID = TASKSLOTEMPTY;
break;
@@ -3174,7 +3158,7 @@ void ClientTaskState::RemoveTask(Client *c, int sequenceNumber, TaskType type)
characterID, task_id);
auto results = database.QueryDatabase(query);
if (!results.Success()) {
Log(Logs::General, Logs::Error, "[TASKS] Error in CientTaskState::CancelTask %s",
LogError("[TASKS] Error in CientTaskState::CancelTask [{}]",
results.ErrorMessage().c_str());
return;
}
@@ -3184,7 +3168,7 @@ void ClientTaskState::RemoveTask(Client *c, int sequenceNumber, TaskType type)
task_id, static_cast<int>(type));
results = database.QueryDatabase(query);
if (!results.Success())
Log(Logs::General, Logs::Error, "[TASKS] Error in CientTaskState::CancelTask %s",
LogError("[TASKS] Error in CientTaskState::CancelTask [{}]",
results.ErrorMessage().c_str());
Log(Logs::General, Logs::Tasks, "[UPDATE] CancelTask: %s", query.c_str());