pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-07 19:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename MAXACTIVETASKS to MAXACTIVEQUESTS

Browse Source
This commit is contained in:
Michael Cook (mackal) 2018-06-13 17:51:35 -04:00
parent c35e010461
commit 247d478990
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
zone/tasks.cpp
View File

@ -292,7 +292,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state) {
Log(Logs::Detail, Logs::Tasks,"TaskManager::SaveClientState for character ID %d", characterID); Log(Logs::Detail, Logs::Tasks,"TaskManager::SaveClientState for character ID %d", characterID);
if(state->ActiveTaskCount > 0) { if(state->ActiveTaskCount > 0) {
for(int task=0; task<MAXACTIVETASKS; task++) { for(int task=0; task<MAXACTIVEQUESTS; task++) {
int taskID = state->ActiveTasks[task].TaskID; int taskID = state->ActiveTasks[task].TaskID;
if(taskID==TASKSLOTEMPTY) if(taskID==TASKSLOTEMPTY)
continue; continue;
@ -464,7 +464,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
continue; continue;
} }
if((slot<0) || (slot>=MAXACTIVETASKS)) { 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;
} }
@ -518,7 +518,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
// Find Active Task Slot // Find Active Task Slot
int activeTaskIndex = -1; int activeTaskIndex = -1;
for(int i=0; i<MAXACTIVETASKS; i++) for(int i=0; i<MAXACTIVEQUESTS; i++)
if(state->ActiveTasks[i].TaskID == taskID) { if(state->ActiveTasks[i].TaskID == taskID) {
activeTaskIndex = i; activeTaskIndex = i;
break; break;
@ -632,7 +632,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
// Check that there is an entry in the client task state for every activity in each task // Check that there is an entry in the client task state for every activity in each task
// This should only break if a ServerOP adds or deletes activites for a task that players already // This should only break if a ServerOP adds or deletes activites for a task that players already
// have active, or due to a bug. // have active, or due to a bug.
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
int taskID = state->ActiveTasks[i].TaskID; int taskID = state->ActiveTasks[i].TaskID;
if(taskID==TASKSLOTEMPTY) continue; if(taskID==TASKSLOTEMPTY) continue;
if(!Tasks[taskID]) { if(!Tasks[taskID]) {
@ -659,7 +659,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
} }
} }
for(int i=0; i<MAXACTIVETASKS; i++) for(int i=0; i<MAXACTIVEQUESTS; i++)
if(state->ActiveTasks[i].TaskID != TASKSLOTEMPTY) if(state->ActiveTasks[i].TaskID != TASKSLOTEMPTY)
state->UnlockActivities(characterID, i); state->UnlockActivities(characterID, i);
@ -1281,7 +1281,7 @@ ClientTaskState::ClientTaskState() {
LastCompletedTaskLoaded = 0; LastCompletedTaskLoaded = 0;
CheckedTouchActivities = false; CheckedTouchActivities = false;
for(int i=0; i<MAXACTIVETASKS; i++) for(int i=0; i<MAXACTIVEQUESTS; i++)
ActiveTasks[i].TaskID = TASKSLOTEMPTY; ActiveTasks[i].TaskID = TASKSLOTEMPTY;
} }
@ -1293,7 +1293,7 @@ int ClientTaskState::GetActiveTaskID(int index) {
// Return the TaskID from the client's specified Active Task slot. // Return the TaskID from the client's specified Active Task slot.
if((index<0) || (index>=MAXACTIVETASKS)) return 0; if((index<0) || (index>=MAXACTIVEQUESTS)) return 0;
return ActiveTasks[index].TaskID; return ActiveTasks[index].TaskID;
} }
@ -1485,7 +1485,7 @@ bool ClientTaskState::UpdateTasksByNPC(Client *c, int ActivityType, int NPCTypeI
if(!taskmanager || ActiveTaskCount == 0) return false; if(!taskmanager || ActiveTaskCount == 0) return false;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue; if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue;
// Check if there are any active kill activities for this task // Check if there are any active kill activities for this task
@ -1538,7 +1538,7 @@ int ClientTaskState::ActiveSpeakTask(int NPCTypeID) {
if(!taskmanager || ActiveTaskCount == 0) return 0; if(!taskmanager || ActiveTaskCount == 0) return 0;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue; if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue;
TaskInformation* Task = taskmanager->Tasks[ActiveTasks[i].TaskID]; TaskInformation* Task = taskmanager->Tasks[ActiveTasks[i].TaskID];
@ -1569,7 +1569,7 @@ int ClientTaskState::ActiveSpeakActivity(int NPCTypeID, int TaskID) {
if(!taskmanager || ActiveTaskCount == 0) return -1; if(!taskmanager || ActiveTaskCount == 0) return -1;
if((TaskID<=0) || (TaskID>=MAXTASKS)) return -1; if((TaskID<=0) || (TaskID>=MAXTASKS)) return -1;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID != TaskID) continue; if(ActiveTasks[i].TaskID != TaskID) continue;
TaskInformation* Task = taskmanager->Tasks[ActiveTasks[i].TaskID]; TaskInformation* Task = taskmanager->Tasks[ActiveTasks[i].TaskID];
@ -1605,7 +1605,7 @@ void ClientTaskState::UpdateTasksForItem(Client *c, ActivityType Type, int ItemI
if(ActiveTaskCount == 0) return; if(ActiveTaskCount == 0) return;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue; if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue;
// Check if there are any active loot activities for this task // Check if there are any active loot activities for this task
@ -1657,7 +1657,7 @@ void ClientTaskState::UpdateTasksOnExplore(Client *c, int ExploreID) {
Log(Logs::General, Logs::Tasks, "[UPDATE] ClientTaskState::UpdateTasksOnExplore(%i)", ExploreID); Log(Logs::General, Logs::Tasks, "[UPDATE] ClientTaskState::UpdateTasksOnExplore(%i)", ExploreID);
if(ActiveTaskCount == 0) return; if(ActiveTaskCount == 0) return;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue; if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue;
// Check if there are any active explore activities for this task // Check if there are any active explore activities for this task
@ -1712,7 +1712,7 @@ bool ClientTaskState::UpdateTasksOnDeliver(Client *c, std::list<EQEmu::ItemInsta
if(ActiveTaskCount == 0) return false; if(ActiveTaskCount == 0) return false;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue; if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue;
// Check if there are any active deliver activities for this task // Check if there are any active deliver activities for this task
@ -1778,7 +1778,7 @@ void ClientTaskState::UpdateTasksOnTouch(Client *c, int ZoneID) {
Log(Logs::General, Logs::Tasks, "[UPDATE] ClientTaskState::UpdateTasksOnTouch(%i)", ZoneID); Log(Logs::General, Logs::Tasks, "[UPDATE] ClientTaskState::UpdateTasksOnTouch(%i)", ZoneID);
if(ActiveTaskCount == 0) return; if(ActiveTaskCount == 0) return;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue; if(ActiveTasks[i].TaskID == TASKSLOTEMPTY) continue;
// Check if there are any active explore activities for this task // Check if there are any active explore activities for this task
@ -2002,7 +2002,7 @@ bool ClientTaskState::IsTaskActive(int TaskID) {
if((ActiveTaskCount == 0) || (TaskID == 0)) return false; if((ActiveTaskCount == 0) || (TaskID == 0)) return false;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID==TaskID) return true; if(ActiveTasks[i].TaskID==TaskID) return true;
@ -2016,7 +2016,7 @@ void ClientTaskState::FailTask(Client *c, int TaskID) {
Log(Logs::General, Logs::Tasks, "[UPDATE] FailTask %i, ActiveTaskCount is %i", TaskID, ActiveTaskCount); Log(Logs::General, Logs::Tasks, "[UPDATE] FailTask %i, ActiveTaskCount is %i", TaskID, ActiveTaskCount);
if(ActiveTaskCount == 0) return; if(ActiveTaskCount == 0) return;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID==TaskID) { if(ActiveTasks[i].TaskID==TaskID) {
c->SendTaskFailed(ActiveTasks[i].TaskID, i); c->SendTaskFailed(ActiveTasks[i].TaskID, i);
@ -2038,7 +2038,7 @@ bool ClientTaskState::IsTaskActivityActive(int TaskID, int ActivityID) {
int ActiveTaskIndex = -1; int ActiveTaskIndex = -1;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID==TaskID) { if(ActiveTasks[i].TaskID==TaskID) {
ActiveTaskIndex = i; ActiveTaskIndex = i;
break; break;
@ -2074,7 +2074,7 @@ void ClientTaskState::UpdateTaskActivity(Client *c, int TaskID, int ActivityID,
int ActiveTaskIndex = -1; int ActiveTaskIndex = -1;
for (int i = 0; i < MAXACTIVETASKS; i++) { for (int i = 0; i < MAXACTIVEQUESTS; i++) {
if (ActiveTasks[i].TaskID == TaskID) { if (ActiveTasks[i].TaskID == TaskID) {
ActiveTaskIndex = i; ActiveTaskIndex = i;
break; break;
@ -2108,7 +2108,7 @@ void ClientTaskState::ResetTaskActivity(Client *c, int TaskID, int ActivityID) {
int ActiveTaskIndex = -1; int ActiveTaskIndex = -1;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID==TaskID) { if(ActiveTasks[i].TaskID==TaskID) {
ActiveTaskIndex = i; ActiveTaskIndex = i;
break; break;
@ -2144,7 +2144,7 @@ void ClientTaskState::ShowClientTasks(Client *c) {
c->Message(0, "Task Information:"); c->Message(0, "Task Information:");
//for(int i=0; i<ActiveTaskCount; i++) { //for(int i=0; i<ActiveTaskCount; i++) {
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID==TASKSLOTEMPTY) if(ActiveTasks[i].TaskID==TASKSLOTEMPTY)
continue; continue;
@ -2164,7 +2164,7 @@ int ClientTaskState::TaskTimeLeft(int TaskID) {
if(ActiveTaskCount == 0) return -1; if(ActiveTaskCount == 0) return -1;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID != TaskID) continue; if(ActiveTasks[i].TaskID != TaskID) continue;
@ -2217,7 +2217,7 @@ bool ClientTaskState::TaskOutOfTime(int Index) {
// Returns true if the Task in the specified slot has a time limit that has been exceeded. // Returns true if the Task in the specified slot has a time limit that has been exceeded.
if((Index < 0) || (Index>=MAXACTIVETASKS)) return false; if((Index < 0) || (Index>=MAXACTIVEQUESTS)) return false;
if((ActiveTasks[Index].TaskID <= 0) || (ActiveTasks[Index].TaskID >= MAXTASKS)) return false; if((ActiveTasks[Index].TaskID <= 0) || (ActiveTasks[Index].TaskID >= MAXTASKS)) return false;
@ -2237,7 +2237,7 @@ void ClientTaskState::TaskPeriodicChecks(Client *c) {
// Check for tasks that have failed because they have not been completed in the specified time // Check for tasks that have failed because they have not been completed in the specified time
// //
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID==TASKSLOTEMPTY) continue; if(ActiveTasks[i].TaskID==TASKSLOTEMPTY) continue;
@ -2696,7 +2696,7 @@ void TaskManager::SendTaskActivityNew(Client *c, int TaskID, int ActivityID, int
void TaskManager::SendActiveTasksToClient(Client *c, bool TaskComplete) { void TaskManager::SendActiveTasksToClient(Client *c, bool TaskComplete) {
//for(int TaskIndex=0; TaskIndex<c->GetActiveTaskCount(); TaskIndex++) { //for(int TaskIndex=0; TaskIndex<c->GetActiveTaskCount(); TaskIndex++) {
for(int TaskIndex=0; TaskIndex<MAXACTIVETASKS; TaskIndex++) { for(int TaskIndex=0; TaskIndex<MAXACTIVEQUESTS; TaskIndex++) {
int TaskID = c->GetActiveTaskID(TaskIndex); int TaskID = c->GetActiveTaskID(TaskIndex);
if((TaskID==0) || (Tasks[TaskID] ==0)) continue; if((TaskID==0) || (Tasks[TaskID] ==0)) continue;
int StartTime = c->GetTaskStartTime(TaskIndex); int StartTime = c->GetTaskStartTime(TaskIndex);
@ -2730,7 +2730,7 @@ void TaskManager::SendActiveTasksToClient(Client *c, bool TaskComplete) {
void TaskManager::SendSingleActiveTaskToClient(Client *c, int TaskIndex, bool TaskComplete, bool BringUpTaskJournal) { void TaskManager::SendSingleActiveTaskToClient(Client *c, int TaskIndex, bool TaskComplete, bool BringUpTaskJournal) {
if((TaskIndex < 0) || (TaskIndex >= MAXACTIVETASKS)) return; if((TaskIndex < 0) || (TaskIndex >= MAXACTIVEQUESTS)) return;
int TaskID = c->GetActiveTaskID(TaskIndex); int TaskID = c->GetActiveTaskID(TaskIndex);
@ -2893,7 +2893,7 @@ int ClientTaskState::GetTaskActivityDoneCount(int index, int ActivityID) {
int ClientTaskState::GetTaskActivityDoneCountFromTaskID(int TaskID, int ActivityID){ int ClientTaskState::GetTaskActivityDoneCountFromTaskID(int TaskID, int ActivityID){
int ActiveTaskIndex = -1; int ActiveTaskIndex = -1;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID==TaskID) { if(ActiveTasks[i].TaskID==TaskID) {
ActiveTaskIndex = i; ActiveTaskIndex = i;
break; break;
@ -2923,7 +2923,7 @@ void ClientTaskState::CancelAllTasks(Client *c) {
// It removes tasks from the in-game client state ready for them to be // It removes tasks from the in-game client state ready for them to be
// resent to the client, in case an updated task fails to load // resent to the client, in case an updated task fails to load
for(int i=0; i<MAXACTIVETASKS; i++) for(int i=0; i<MAXACTIVEQUESTS; i++)
if(ActiveTasks[i].TaskID != TASKSLOTEMPTY) { if(ActiveTasks[i].TaskID != TASKSLOTEMPTY) {
CancelTask(c, i, false); CancelTask(c, i, false);
ActiveTasks[i].TaskID = TASKSLOTEMPTY; ActiveTasks[i].TaskID = TASKSLOTEMPTY;
@ -2988,12 +2988,12 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
return; return;
} }
if(ActiveTaskCount==MAXACTIVETASKS) { if(ActiveTaskCount==MAXACTIVEQUESTS) {
c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVETASKS); c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
return; return;
} }
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
if(ActiveTasks[i].TaskID==TaskID) { if(ActiveTasks[i].TaskID==TaskID) {
c->Message(13, "You have already been assigned this task."); c->Message(13, "You have already been assigned this task.");
return; return;
@ -3014,7 +3014,7 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
// waste of bandwidth. // waste of bandwidth.
// //
int FreeSlot = -1; int FreeSlot = -1;
for(int i=0; i<MAXACTIVETASKS; i++) { for(int i=0; i<MAXACTIVEQUESTS; i++) {
Log(Logs::General, Logs::Tasks, "[UPDATE] ClientTaskState Looking for free slot in slot %i, found TaskID of %i", Log(Logs::General, Logs::Tasks, "[UPDATE] ClientTaskState Looking for free slot in slot %i, found TaskID of %i",
i, ActiveTasks[i].TaskID); i, ActiveTasks[i].TaskID);
if(ActiveTasks[i].TaskID == 0) { if(ActiveTasks[i].TaskID == 0) {
@ -3025,7 +3025,7 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
// This shouldn't happen unless there is a bug in the handling of ActiveTaskCount somewhere // This shouldn't happen unless there is a bug in the handling of ActiveTaskCount somewhere
if(FreeSlot == -1) { if(FreeSlot == -1) {
c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVETASKS); c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
return; return;
} }

8
zone/tasks.h
View File

@ -28,8 +28,8 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net)
#define MAXTASKS 10000 #define MAXTASKS 10000
#define MAXTASKSETS 1000 #define MAXTASKSETS 1000
// The Client has a hard cap of 19 active tasks // The Client has a hard cap of 19 active tasks, 29 in RoF2
#define MAXACTIVETASKS 19 #define MAXACTIVEQUESTS 19
// The Max Chooser (Task Selector entries) is capped at 40 in the Titanium Client. // The Max Chooser (Task Selector entries) is capped at 40 in the Titanium Client.
#define MAXCHOOSERENTRIES 40 #define MAXCHOOSERENTRIES 40
// The Client has a hard cap of 20 activities per task. // The Client has a hard cap of 20 activities per task.
@ -228,8 +228,8 @@ private:
bool UnlockActivities(int CharID, int TaskIndex); bool UnlockActivities(int CharID, int TaskIndex);
void IncrementDoneCount(Client *c, TaskInformation *Task, int TaskIndex, int ActivityID, int Count = 1, bool ignore_quest_update = false); void IncrementDoneCount(Client *c, TaskInformation *Task, int TaskIndex, int ActivityID, int Count = 1, bool ignore_quest_update = false);
int ActiveTaskCount; int ActiveTaskCount;
ClientTaskInformation ActiveTasks[MAXACTIVETASKS]; ClientTaskInformation ActiveTasks[MAXACTIVEQUESTS];
std::vector<int>EnabledTasks; std::vector<int> EnabledTasks;
std::vector<CompletedTaskInformation> CompletedTasks; std::vector<CompletedTaskInformation> CompletedTasks;
int LastCompletedTaskLoaded; int LastCompletedTaskLoaded;
bool CheckedTouchActivities; bool CheckedTouchActivities;