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

Move data aliases after null checks for safety [skip ci]

Browse Source
This commit is contained in:
Akkadius 2021-02-08 21:50:28 -06:00
parent dcc921efcb
commit ef0398ebd3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/task_manager.cpp
View File

@ -154,10 +154,6 @@ bool TaskManager::LoadTasks(int single_task)
int step = task_activity.step; int step = task_activity.step;
int activity_id = task_activity.activityid; int activity_id = task_activity.activityid;
// create pointer to activity data since declarations get unruly long
int activity_index = m_task_data[task_id]->activity_count;
ActivityInformation *activity_data = &m_task_data[task_id]->activity_information[activity_index];
if ((task_id <= 0) || (task_id >= MAXTASKS) || (activity_id < 0) || (activity_id >= MAXACTIVITIESPERTASK)) { if ((task_id <= 0) || (task_id >= MAXTASKS) || (activity_id < 0) || (activity_id >= MAXACTIVITIESPERTASK)) {
// This shouldn't happen, as the SELECT is bounded by MAXTASKS // This shouldn't happen, as the SELECT is bounded by MAXTASKS
@ -178,6 +174,10 @@ bool TaskManager::LoadTasks(int single_task)
continue; continue;
} }
// create pointer to activity data since declarations get unruly long
int activity_index = m_task_data[task_id]->activity_count;
ActivityInformation *activity_data = &m_task_data[task_id]->activity_information[activity_index];
m_task_data[task_id]->activity_information[m_task_data[task_id]->activity_count].step_number = step; m_task_data[task_id]->activity_information[m_task_data[task_id]->activity_count].step_number = step;
if (step != 0) { if (step != 0) {
@ -1653,4 +1653,4 @@ bool TaskManager::LoadClientState(Client *client, ClientTaskState *client_task_s
LogTasks("[LoadClientState] for Character ID [{}] DONE!", character_id); LogTasks("[LoadClientState] for Character ID [{}] DONE!", character_id);
return true; return true;
} }