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

More cleanup

Browse Source
This commit is contained in:
Akkadius 2021-02-06 17:38:11 -06:00
parent ed9f155f7c
commit b01793081a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zone/client.h
View File

@ -1025,13 +1025,13 @@ public:
void SendTaskFailed(int task_id, int task_index, TaskType task_type); void SendTaskFailed(int task_id, int task_index, TaskType task_type);
void SendTaskComplete(int task_index); void SendTaskComplete(int task_index);
inline ClientTaskState *GetTaskState() const { return task_state; } inline ClientTaskState *GetTaskState() const { return task_state; }
inline void CancelTask(int TaskIndex, TaskType type) inline void CancelTask(int task_index, TaskType task_type)
{ {
if (task_state) { if (task_state) {
task_state->CancelTask( task_state->CancelTask(
this, this,
TaskIndex, task_index,
type task_type
); );
} }
} }
@ -1040,13 +1040,13 @@ public:
return p_task_manager != nullptr && p_task_manager->SaveClientState(this, task_state); return p_task_manager != nullptr && p_task_manager->SaveClientState(this, task_state);
} }
inline bool IsTaskStateLoaded() { return task_state != nullptr; } inline bool IsTaskStateLoaded() { return task_state != nullptr; }
inline bool IsTaskActive(int TaskID) { return task_state != nullptr && task_state->IsTaskActive(TaskID); } inline bool IsTaskActive(int task_id) { return task_state != nullptr && task_state->IsTaskActive(task_id); }
inline bool IsTaskActivityActive(int TaskID, int ActivityID) inline bool IsTaskActivityActive(int task_id, int activity_id)
{ {
return task_state != nullptr && return task_state != nullptr &&
task_state->IsTaskActivityActive( task_state->IsTaskActivityActive(
TaskID, task_id,
ActivityID activity_id
); );
} }
inline ActivityState GetTaskActivityState(TaskType task_type, int index, int activity_id) inline ActivityState GetTaskActivityState(TaskType task_type, int index, int activity_id)
@ -1179,14 +1179,14 @@ public:
inline bool IsTaskEnabled(int task_id) { inline bool IsTaskEnabled(int task_id) {
return task_state != nullptr && task_state->IsTaskEnabled(task_id); return task_state != nullptr && task_state->IsTaskEnabled(task_id);
} }
inline void ProcessTaskProximities(float X, float Y, float Z) inline void ProcessTaskProximities(float x, float y, float z)
{ {
if (task_state) { if (task_state) {
task_state->ProcessTaskProximities( task_state->ProcessTaskProximities(
this, this,
X, x,
Y, y,
Z z
); );
} }
} }

4
zone/tasks.cpp
View File

@ -4043,8 +4043,8 @@ bool TaskGoalListManager::IsInList(int list_id, int entry)
return false; return false;
} }
Log(Logs::General, Logs::Tasks, "[UPDATE] TaskGoalListManager::IsInList(%i, %i) returning true", list_index, Log(Logs::General, Logs::Tasks, "[UPDATE] TaskGoalListManager::IsInList(%i, %i) returning true", list_index, entry);
entry);
return true; return true;
} }