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

Remove startzone from tasks table since it's not needed

Browse Source
This commit is contained in:
Michael Cook (mackal) 2018-07-08 18:42:26 -04:00
parent 2418c3dd74
commit 3969ac346d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zone/tasks.cpp
View File

@ -117,12 +117,12 @@ bool TaskManager::LoadTasks(int singleTask)
Log(Logs::Detail, Logs::Tasks, "TaskManager::LoadTasks LoadTaskSets failed"); Log(Logs::Detail, Logs::Tasks, "TaskManager::LoadTasks LoadTaskSets failed");
query = StringFormat("SELECT `id`, `type`, `duration`, `duration_code`, `title`, `description`, " query = StringFormat("SELECT `id`, `type`, `duration`, `duration_code`, `title`, `description`, "
"`reward`, `rewardid`, `cashreward`, `xpreward`, `rewardmethod`, `startzone`, " "`reward`, `rewardid`, `cashreward`, `xpreward`, `rewardmethod`, "
"`minlevel`, `maxlevel`, `repeatable` FROM `tasks` WHERE `id` < %i", "`minlevel`, `maxlevel`, `repeatable` FROM `tasks` WHERE `id` < %i",
MAXTASKS); MAXTASKS);
} else } else
query = StringFormat("SELECT `id`, `type`, `duration`, `duration_code`, `title`, `description`, " query = StringFormat("SELECT `id`, `type`, `duration`, `duration_code`, `title`, `description`, "
"`reward`, `rewardid`, `cashreward`, `xpreward`, `rewardmethod`, `startzone`, " "`reward`, `rewardid`, `cashreward`, `xpreward`, `rewardmethod`, "
"`minlevel`, `maxlevel`, `repeatable` FROM `tasks` WHERE `id` = %i", "`minlevel`, `maxlevel`, `repeatable` FROM `tasks` WHERE `id` = %i",
singleTask); singleTask);
@ -155,18 +155,17 @@ bool TaskManager::LoadTasks(int singleTask)
Tasks[taskID]->CashReward = atoi(row[8]); Tasks[taskID]->CashReward = atoi(row[8]);
Tasks[taskID]->XPReward = atoi(row[9]); Tasks[taskID]->XPReward = atoi(row[9]);
Tasks[taskID]->RewardMethod = (TaskMethodType)atoi(row[10]); Tasks[taskID]->RewardMethod = (TaskMethodType)atoi(row[10]);
Tasks[taskID]->StartZone = atoi(row[11]); Tasks[taskID]->MinLevel = atoi(row[11]);
Tasks[taskID]->MinLevel = atoi(row[12]); Tasks[taskID]->MaxLevel = atoi(row[12]);
Tasks[taskID]->MaxLevel = atoi(row[13]); Tasks[taskID]->Repeatable = atoi(row[13]);
Tasks[taskID]->Repeatable = atoi(row[14]);
Tasks[taskID]->ActivityCount = 0; Tasks[taskID]->ActivityCount = 0;
Tasks[taskID]->SequenceMode = ActivitiesSequential; Tasks[taskID]->SequenceMode = ActivitiesSequential;
Tasks[taskID]->LastStep = 0; Tasks[taskID]->LastStep = 0;
Log(Logs::General, Logs::Tasks, Log(Logs::General, Logs::Tasks,
"[GLOBALLOAD] TaskID: %5i, Duration: %8i, StartZone: %3i Reward: %s MinLevel %i MaxLevel %i " "[GLOBALLOAD] TaskID: %5i, Duration: %8i, Reward: %s MinLevel %i MaxLevel %i "
"Repeatable: %s", "Repeatable: %s",
taskID, Tasks[taskID]->Duration, Tasks[taskID]->StartZone, Tasks[taskID]->Reward.c_str(), taskID, Tasks[taskID]->Duration, Tasks[taskID]->Reward.c_str(),
Tasks[taskID]->MinLevel, Tasks[taskID]->MaxLevel, Tasks[taskID]->Repeatable ? "Yes" : "No"); Tasks[taskID]->MinLevel, Tasks[taskID]->MaxLevel, Tasks[taskID]->Repeatable ? "Yes" : "No");
Log(Logs::General, Logs::Tasks, "[GLOBALLOAD] Title: %s", Tasks[taskID]->Title.c_str()); Log(Logs::General, Logs::Tasks, "[GLOBALLOAD] Title: %s", Tasks[taskID]->Title.c_str());
} }

1
zone/tasks.h
View File

@ -146,7 +146,6 @@ struct TaskInformation {
int CashReward; // Expressed in copper int CashReward; // Expressed in copper
int XPReward; int XPReward;
TaskMethodType RewardMethod; TaskMethodType RewardMethod;
int StartZone;
int ActivityCount; int ActivityCount;
SequenceType SequenceMode; SequenceType SequenceMode;
int LastStep; int LastStep;