pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-31 14:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reformat save/load since they were lacking tabs

Browse Source
This commit is contained in:
Michael Cook (mackal) 2018-07-08 17:35:37 -04:00
parent 9b229779db
commit 7e0c4eb93f
1 changed files with 279 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
zone/tasks.cpp
View File

@ -278,13 +278,12 @@ bool TaskManager::LoadTasks(int singleTask)
return true; return true;
} }
bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) { bool TaskManager::SaveClientState(Client *c, ClientTaskState *state)
{
// I am saving the slot in the ActiveTasks table, because unless a Task is cancelled/completed, the client doesn't // I am saving the slot in the ActiveTasks table, because unless a Task is cancelled/completed, the client
// seem to like tasks moving slots between zoning and you can end up with 'bogus' activities if the task previously // doesn't seem to like tasks moving slots between zoning and you can end up with 'bogus' activities if the task
// in that slot had more activities than the one now occupying it. Hopefully retaining the slot number for the // previously in that slot had more activities than the one now occupying it. Hopefully retaining the slot
// duration of a session will overcome this. // number for the duration of a session will overcome this.
//
if (!c || !state) if (!c || !state)
return false; return false;
@ -302,22 +301,26 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) {
if (state->ActiveQuests[task].Updated) { if (state->ActiveQuests[task].Updated) {
Log(Logs::General, Logs::Tasks, "[CLIENTSAVE] TaskManager::SaveClientState for character ID %d, Updating TaskIndex %i TaskID %i", characterID, task, taskID); Log(Logs::General, Logs::Tasks,
"[CLIENTSAVE] TaskManager::SaveClientState for character ID %d, Updating TaskIndex "
"%i TaskID %i",
characterID, task, taskID);
std::string query = StringFormat("REPLACE INTO character_tasks (charid, taskid, slot, type, acceptedtime) " std::string query = StringFormat(
"REPLACE INTO character_tasks (charid, taskid, slot, type, acceptedtime) "
"VALUES (%i, %i, %i, %i, %i)", "VALUES (%i, %i, %i, %i, %i)",
characterID, taskID, task, static_cast<int>(Tasks[taskID]->type), state->ActiveQuests[task].AcceptedTime); characterID, taskID, task, static_cast<int>(Tasks[taskID]->type),
state->ActiveQuests[task].AcceptedTime);
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str()); Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
} } else {
else {
state->ActiveQuests[task].Updated = false; state->ActiveQuests[task].Updated = false;
} }
} }
std::string query = "REPLACE INTO character_activities (charid, taskid, activityid, donecount, completed) " std::string query =
"REPLACE INTO character_activities (charid, taskid, activityid, donecount, completed) "
"VALUES "; "VALUES ";
int updatedActivityCount = 0; int updatedActivityCount = 0;
@ -326,19 +329,23 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) {
if (!state->ActiveQuests[task].Activity[activityIndex].Updated) if (!state->ActiveQuests[task].Activity[activityIndex].Updated)
continue; continue;
Log(Logs::General, Logs::Tasks, "[CLIENTSAVE] TaskManager::SaveClientSate for character ID %d, Updating Activity %i, %i", Log(Logs::General, Logs::Tasks,
"[CLIENTSAVE] TaskManager::SaveClientSate for character ID %d, Updating Activity "
"%i, %i",
characterID, task, activityIndex); characterID, task, activityIndex);
if (updatedActivityCount == 0) if (updatedActivityCount == 0)
query += StringFormat("(%i, %i, %i, %i, %i)", query +=
characterID, taskID, activityIndex, StringFormat("(%i, %i, %i, %i, %i)", characterID, taskID, activityIndex,
state->ActiveQuests[task].Activity[activityIndex].DoneCount, state->ActiveQuests[task].Activity[activityIndex].DoneCount,
state->ActiveQuests[task].Activity[activityIndex].State == ActivityCompleted); state->ActiveQuests[task].Activity[activityIndex].State ==
ActivityCompleted);
else else
query += StringFormat(", (%i, %i, %i, %i, %i)", query +=
characterID, taskID, activityIndex, StringFormat(", (%i, %i, %i, %i, %i)", characterID, taskID, activityIndex,
state->ActiveQuests[task].Activity[activityIndex].DoneCount, state->ActiveQuests[task].Activity[activityIndex].DoneCount,
state->ActiveQuests[task].Activity[activityIndex].State == ActivityCompleted); state->ActiveQuests[task].Activity[activityIndex].State ==
ActivityCompleted);
updatedActivityCount++; updatedActivityCount++;
} }
@ -357,11 +364,11 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) {
state->ActiveQuests[task].Updated = false; state->ActiveQuests[task].Updated = false;
for (int activityIndex = 0; activityIndex < Tasks[taskID]->ActivityCount; ++activityIndex) for (int activityIndex = 0; activityIndex < Tasks[taskID]->ActivityCount; ++activityIndex)
state->ActiveQuests[task].Activity[activityIndex].Updated = false; state->ActiveQuests[task].Activity[activityIndex].Updated = false;
} }
} }
if(!RuleB(TaskSystem, RecordCompletedTasks) || (state->CompletedTasks.size() <= (unsigned int)state->LastCompletedTaskLoaded)) { if (!RuleB(TaskSystem, RecordCompletedTasks) ||
(state->CompletedTasks.size() <= (unsigned int)state->LastCompletedTaskLoaded)) {
state->LastCompletedTaskLoaded = state->CompletedTasks.size(); state->LastCompletedTaskLoaded = state->CompletedTasks.size();
return true; return true;
} }
@ -371,7 +378,8 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) {
for (unsigned int i = state->LastCompletedTaskLoaded; i < state->CompletedTasks.size(); i++) { for (unsigned int i = state->LastCompletedTaskLoaded; i < state->CompletedTasks.size(); i++) {
Log(Logs::General, Logs::Tasks, "[CLIENTSAVE] TaskManager::SaveClientState Saving Completed Task at slot %i", i); Log(Logs::General, Logs::Tasks,
"[CLIENTSAVE] TaskManager::SaveClientState Saving Completed Task at slot %i", i);
int taskID = state->CompletedTasks[i].TaskID; int taskID = state->CompletedTasks[i].TaskID;
if ((taskID <= 0) || (taskID >= MAXTASKS) || (Tasks[taskID] == nullptr)) if ((taskID <= 0) || (taskID >= MAXTASKS) || (Tasks[taskID] == nullptr))
@ -381,7 +389,8 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) {
// This indicates this task was completed at the given time. We infer that all // This indicates this task was completed at the given time. We infer that all
// none optional activities were completed. // none optional activities were completed.
// //
std::string query = StringFormat(completedTaskQuery, characterID, state->CompletedTasks[i].CompletedTime, taskID, -1); std::string query =
StringFormat(completedTaskQuery, characterID, state->CompletedTasks[i].CompletedTime, taskID, -1);
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str()); Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
@ -398,20 +407,18 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) {
if (!Tasks[taskID]->Activity[j].Optional || !state->CompletedTasks[i].ActivityDone[j]) if (!Tasks[taskID]->Activity[j].Optional || !state->CompletedTasks[i].ActivityDone[j])
continue; continue;
query = StringFormat(completedTaskQuery, characterID, state->CompletedTasks[i].CompletedTime, taskID, j); query = StringFormat(completedTaskQuery, characterID, state->CompletedTasks[i].CompletedTime,
taskID, j);
results = database.QueryDatabase(query); results = database.QueryDatabase(query);
if (!results.Success()) if (!results.Success())
Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str()); Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
} }
} }
state->LastCompletedTaskLoaded = state->CompletedTasks.size(); state->LastCompletedTaskLoaded = state->CompletedTasks.size();
return true; return true;
} }
void Client::LoadClientTaskState() { void Client::LoadClientTaskState() {
if(RuleB(TaskSystem, EnableTaskSystem) && taskmanager) { if(RuleB(TaskSystem, EnableTaskSystem) && taskmanager) {
@ -438,8 +445,8 @@ void Client::RemoveClientTaskState() {
} }
} }
bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) { bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
{
if (!c || !state) if (!c || !state)
return false; return false;
@ -451,10 +458,12 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
std::string query = StringFormat("SELECT `taskid`, `slot`, `acceptedtime` " std::string query = StringFormat("SELECT `taskid`, `slot`, `acceptedtime` "
"FROM `character_tasks` " "FROM `character_tasks` "
"WHERE `charid` = %i ORDER BY acceptedtime", characterID); "WHERE `charid` = %i ORDER BY acceptedtime",
characterID);
auto results = database.QueryDatabase(query); auto results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load Tasks: %s", results.ErrorMessage().c_str()); Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load Tasks: %s",
results.ErrorMessage().c_str());
return false; return false;
} }
@ -463,17 +472,20 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
int slot = atoi(row[1]); int slot = atoi(row[1]);
if ((taskID < 0) || (taskID >= MAXTASKS)) { if ((taskID < 0) || (taskID >= MAXTASKS)) {
Log(Logs::General, Logs::Error, "[TASKS]Task ID %i out of range while loading character tasks from database", taskID); Log(Logs::General, Logs::Error,
"[TASKS]Task ID %i out of range while loading character tasks from database", taskID);
continue; continue;
} }
if ((slot < 0) || (slot >= MAXACTIVEQUESTS)) { if ((slot < 0) || (slot >= MAXACTIVEQUESTS)) {
Log(Logs::General, Logs::Error, "[TASKS] Slot %i out of range while loading character tasks from database", slot); Log(Logs::General, Logs::Error,
"[TASKS] Slot %i out of range while loading character tasks from database", slot);
continue; continue;
} }
if (state->ActiveQuests[slot].TaskID != TASKSLOTEMPTY) { if (state->ActiveQuests[slot].TaskID != TASKSLOTEMPTY) {
Log(Logs::General, Logs::Error, "[TASKS] Slot %i for Task %is is already occupied.", slot, taskID); Log(Logs::General, Logs::Error, "[TASKS] Slot %i for Task %is is already occupied.", slot,
taskID);
continue; continue;
} }
@ -489,32 +501,40 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
++state->ActiveTaskCount; ++state->ActiveTaskCount;
Log(Logs::General, Logs::Tasks, "[CLIENTLOAD] TaskManager::LoadClientState. Char: %i Task ID %i, Accepted Time: %8X", characterID, taskID, acceptedtime); Log(Logs::General, Logs::Tasks,
"[CLIENTLOAD] TaskManager::LoadClientState. Char: %i Task ID %i, Accepted Time: %8X", characterID,
taskID, acceptedtime);
} }
// Load Activities // Load Activities
Log(Logs::General, Logs::Tasks, "[CLIENTLOAD] LoadClientState. Loading activities for character ID %d", characterID); Log(Logs::General, Logs::Tasks, "[CLIENTLOAD] LoadClientState. Loading activities for character ID %d",
characterID);
query = StringFormat("SELECT `taskid`, `activityid`, `donecount`, `completed` " query = StringFormat("SELECT `taskid`, `activityid`, `donecount`, `completed` "
"FROM `character_activities` " "FROM `character_activities` "
"WHERE `charid` = %i " "WHERE `charid` = %i "
"ORDER BY `taskid` ASC, `activityid` ASC", characterID); "ORDER BY `taskid` ASC, `activityid` ASC",
characterID);
results = database.QueryDatabase(query); results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load Activities: %s", results.ErrorMessage().c_str()); Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load Activities: %s",
results.ErrorMessage().c_str());
return false; return false;
} }
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
int taskID = atoi(row[0]); int taskID = atoi(row[0]);
if ((taskID < 0) || (taskID >= MAXTASKS)) { if ((taskID < 0) || (taskID >= MAXTASKS)) {
Log(Logs::General, Logs::Error, "[TASKS]Task ID %i out of range while loading character activities from database", taskID); Log(Logs::General, Logs::Error,
"[TASKS]Task ID %i out of range while loading character activities from database", taskID);
continue; continue;
} }
int activityID = atoi(row[1]); int activityID = atoi(row[1]);
if ((activityID < 0) || (activityID >= MAXACTIVITIESPERTASK)) { if ((activityID < 0) || (activityID >= MAXACTIVITIESPERTASK)) {
Log(Logs::General, Logs::Error, "[TASKS]Activity ID %i out of range while loading character activities from database", activityID); Log(Logs::General, Logs::Error,
"[TASKS]Activity ID %i out of range while loading character activities from database",
activityID);
continue; continue;
} }
@ -528,7 +548,8 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
} }
if (activeTaskIndex == -1) { if (activeTaskIndex == -1) {
Log(Logs::General, Logs::Error, "[TASKS]Activity %i found for task %i which client does not have.", activityID, taskID); Log(Logs::General, Logs::Error,
"[TASKS]Activity %i found for task %i which client does not have.", activityID, taskID);
continue; continue;
} }
@ -543,8 +564,10 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
state->ActiveQuests[activeTaskIndex].Activity[activityID].Updated = false; state->ActiveQuests[activeTaskIndex].Activity[activityID].Updated = false;
Log(Logs::General, Logs::Tasks, "[CLIENTLOAD] TaskManager::LoadClientState. Char: %i Task ID %i, ActivityID: %i, DoneCount: %i, Completed: %i", characterID, taskID, activityID, doneCount, completed); Log(Logs::General, Logs::Tasks,
"[CLIENTLOAD] TaskManager::LoadClientState. Char: %i Task ID %i, ActivityID: %i, DoneCount: %i, "
"Completed: %i",
characterID, taskID, activityID, doneCount, completed);
} }
if (RuleB(TaskSystem, RecordCompletedTasks)) { if (RuleB(TaskSystem, RecordCompletedTasks)) {
@ -554,7 +577,9 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
characterID); characterID);
results = database.QueryDatabase(query); results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load completed tasks: %s", results.ErrorMessage().c_str()); Log(Logs::General, Logs::Error,
"[TASKS]Error in TaskManager::LoadClientState load completed tasks: %s",
results.ErrorMessage().c_str());
return false; return false;
} }
@ -570,7 +595,9 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
int taskID = atoi(row[0]); int taskID = atoi(row[0]);
if ((taskID <= 0) || (taskID >= MAXTASKS)) { if ((taskID <= 0) || (taskID >= MAXTASKS)) {
Log(Logs::General, Logs::Error, "[TASKS]Task ID %i out of range while loading completed tasks from database", taskID); Log(Logs::General, Logs::Error,
"[TASKS]Task ID %i out of range while loading completed tasks from database",
taskID);
continue; continue;
} }
@ -580,12 +607,15 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
// completed. // completed.
int activityID = atoi(row[1]); int activityID = atoi(row[1]);
if ((activityID < -1) || (activityID >= MAXACTIVITIESPERTASK)) { if ((activityID < -1) || (activityID >= MAXACTIVITIESPERTASK)) {
Log(Logs::General, Logs::Error, "[TASKS]Activity ID %i out of range while loading completed tasks from database", activityID); Log(Logs::General, Logs::Error,
"[TASKS]Activity ID %i out of range while loading completed tasks from database",
activityID);
continue; continue;
} }
int completedTime = atoi(row[2]); int completedTime = atoi(row[2]);
if((previousTaskID != -1) && ((taskID != previousTaskID) || (completedTime != previousCompletedTime))) { if ((previousTaskID != -1) &&
((taskID != previousTaskID) || (completedTime != previousCompletedTime))) {
state->CompletedTasks.push_back(cti); state->CompletedTasks.push_back(cti);
for (int i = 0; i < MAXACTIVITIESPERTASK; i++) for (int i = 0; i < MAXACTIVITIESPERTASK; i++)
cti.ActivityDone[i] = false; cti.ActivityDone[i] = false;
@ -603,17 +633,14 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
for (int i = 0; i < task->ActivityCount; i++) for (int i = 0; i < task->ActivityCount; i++)
if (!task->Activity[i].Optional) if (!task->Activity[i].Optional)
cti.ActivityDone[i] = true; cti.ActivityDone[i] = true;
} } else
else
cti.ActivityDone[activityID] = true; cti.ActivityDone[activityID] = true;
} }
if (previousTaskID != -1) if (previousTaskID != -1)
state->CompletedTasks.push_back(cti); state->CompletedTasks.push_back(cti);
state->LastCompletedTaskLoaded = state->CompletedTasks.size(); state->LastCompletedTaskLoaded = state->CompletedTasks.size();
} }
query = StringFormat("SELECT `taskid` FROM character_enabledtasks " query = StringFormat("SELECT `taskid` FROM character_enabledtasks "
@ -622,9 +649,9 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
characterID, MAXTASKS); characterID, MAXTASKS);
results = database.QueryDatabase(query); results = database.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load enabled tasks: %s", results.ErrorMessage().c_str()); Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load enabled tasks: %s",
} results.ErrorMessage().c_str());
else { } else {
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
int taskID = atoi(row[0]); int taskID = atoi(row[0]);
state->EnabledTasks.push_back(taskID); state->EnabledTasks.push_back(taskID);
@ -637,25 +664,31 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
// have active, or due to a bug. // have active, or due to a bug.
for (int i = 0; i < MAXACTIVEQUESTS; i++) { for (int i = 0; i < MAXACTIVEQUESTS; i++) {
int taskID = state->ActiveQuests[i].TaskID; int taskID = state->ActiveQuests[i].TaskID;
if(taskID==TASKSLOTEMPTY) continue; if (taskID == TASKSLOTEMPTY)
continue;
if (!Tasks[taskID]) { if (!Tasks[taskID]) {
c->Message(13, "Active Task Slot %i, references a task (%i), that does not exist. " c->Message(13,
"Removing from memory. Contact a GM to resolve this.",i, taskID); "Active Task Slot %i, references a task (%i), that does not exist. "
"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.", characterID, taskID); Log(Logs::General, Logs::Error, "[TASKS]Character %i has task %i which does not exist.",
characterID, taskID);
state->ActiveQuests[i].TaskID = TASKSLOTEMPTY; state->ActiveQuests[i].TaskID = TASKSLOTEMPTY;
continue; continue;
} }
for (int j = 0; j < Tasks[taskID]->ActivityCount; j++) { for (int j = 0; j < Tasks[taskID]->ActivityCount; j++) {
if (state->ActiveQuests[i].Activity[j].ActivityID != j) { if (state->ActiveQuests[i].Activity[j].ActivityID != j) {
c->Message(13, "Active Task %i, %s. Activity count does not match expected value." c->Message(13,
"Active Task %i, %s. Activity count does not match expected value."
"Removing from memory. Contact a GM to resolve this.", "Removing from memory. Contact a GM to resolve this.",
taskID, Tasks[taskID]->Title.c_str()); taskID, Tasks[taskID]->Title.c_str());
Log(Logs::General, Logs::Error, "[TASKS]Fatal error in character %i task state. Activity %i for " Log(Logs::General, Logs::Error,
"Task %i either missing from client state or from task.", characterID, j, taskID); "[TASKS]Fatal error in character %i task state. Activity %i for "
"Task %i either missing from client state or from task.",
characterID, j, taskID);
state->ActiveQuests[i].TaskID = TASKSLOTEMPTY; state->ActiveQuests[i].TaskID = TASKSLOTEMPTY;
break; break;
} }