diff --git a/zone/task_manager.cpp b/zone/task_manager.cpp index 7ba251840..b16d95a4e 100644 --- a/zone/task_manager.cpp +++ b/zone/task_manager.cpp @@ -154,10 +154,6 @@ bool TaskManager::LoadTasks(int single_task) int step = task_activity.step; 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)) { // This shouldn't happen, as the SELECT is bounded by MAXTASKS @@ -178,6 +174,10 @@ bool TaskManager::LoadTasks(int single_task) 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; if (step != 0) { @@ -1653,4 +1653,4 @@ bool TaskManager::LoadClientState(Client *client, ClientTaskState *client_task_s LogTasks("[LoadClientState] for Character ID [{}] DONE!", character_id); return true; -} \ No newline at end of file +}