gistfile1.diff

diff --git a/world/shared_tasks.cpp b/world/shared_tasks.cpp
index 41d193b71..85d3697e2 100644
--- a/world/shared_tasks.cpp
+++ b/world/shared_tasks.cpp
@@ -1,6 +1,8 @@
-#include "shared_tasks.h"
-#include "clientlist.h"
+#include "../common/string_util.h"
 #include "cliententry.h"
+#include "clientlist.h"
+#include "shared_tasks.h"
+#include "worlddb.h"
 #include "zonelist.h"
 
 #include <algorithm>
@@ -158,6 +160,92 @@ void SharedTaskManager::HandleTaskRequest(ServerPacket *pack)
 	return;
 }
 
+bool SharedTaskManager::LoadSharedTasks(int single_task)
+{
+	std::string query;
+
+	if (single_task == 0) {
+		query =
+		    StringFormat("SELECT `id`, `type`, `duration`, `duration_code`, `title`, `description`, `reward`, "
+				 "`rewardid`, `cashreward`, `xpreward`, `rewardmethod`, `faction_reward`, `minlevel`, "
+				 "`maxlevel`, `repeatable`, `completion_emote`, `reward_points`, `reward_type`, "
+				 "`replay_group`, `min_players`, `max_players`, `task_lock_step`, `instance_zone_id`, "
+				 "`zone_version`, `zone_in_zone_id`, `zone_in_x`, `zone_in_y`, `zone_in_object_id`, "
+				 "`dest_x`, `dest_y`, `dest_z`, `dest_h` FROM `tasks` WHERE `type` = %i",
+				 static_cast<int>(TaskType::Shared));
+	} else {
+		query =
+		    StringFormat("SELECT `id`, `type`, `duration`, `duration_code`, `title`, `description`, `reward`, "
+				 "`rewardid`, `cashreward`, `xpreward`, `rewardmethod`, `faction_reward`, `minlevel`, "
+				 "`maxlevel`, `repeatable`, `completion_emote`, `reward_points`, `reward_type`, "
+				 "`replay_group`, `min_players`, `max_players`, `task_lock_step`, `instance_zone_id`, "
+				 "`zone_version`, `zone_in_zone_id`, `zone_in_x`, `zone_in_y`, `zone_in_object_id`, "
+				 "`dest_x`, `dest_y`, `dest_z`, `dest_h` FROM `tasks` WHERE `id` = %i AND `type` = %i",
+				 single_task, static_cast<int>(TaskType::Shared));
+	}
+	auto results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		return false;
+	}
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		int task_id = atoi(row[0]);
+
+		auto &task = task_information[task_id];
+		task.type = static_cast<TaskType>(atoi(row[1]));
+		task.Duration = atoi(row[2]);
+		task.dur_code = static_cast<DurationCode>(atoi(row[3]));
+		task.Title = row[4];
+		task.Description = row[5];
+		task.Reward = row[6];
+		task.RewardID = atoi(row[7]);
+		task.CashReward = atoi(row[8]);
+		task.XPReward = atoi(row[9]);
+		task.RewardMethod = (TaskMethodType)atoi(row[10]);
+		task.faction_reward = atoi(row[11]);
+		task.MinLevel = atoi(row[12]);
+		task.MaxLevel = atoi(row[13]);
+		task.Repeatable = atoi(row[14]);
+		task.completion_emote = row[15];
+		task.reward_points = atoi(row[16]);
+		task.reward_type = static_cast<PointType>(atoi(row[17]));
+		task.replay_group = atoi(row[18]);
+		task.min_players = atoi(row[19]);
+		task.max_players = atoi(row[20]);
+		task.task_lock_step = atoi(row[21]);
+		task.instance_zone_id = atoi(row[22]);
+		task.zone_version = atoi(row[23]);
+		task.zone_in_zone_id = atoi(row[24]);
+		task.zone_in_x = atof(row[25]);
+		task.zone_in_y = atof(row[26]);
+		task.zone_in_object_id = atoi(row[27]);
+		task.dest_x = atof(row[28]);
+		task.dest_y = atof(row[29]);
+		task.dest_z = atof(row[30]);
+		task.dest_h = atof(row[31]);
+		task.ActivityCount = 0;
+		task.SequenceMode = ActivitiesSequential;
+		task.LastStep = 0;
+	}
+
+	// hmm need to limit to shared tasks only ...
+	if (single_task == 0)
+		query =
+		    StringFormat("SELECT `taskid`, `step`, `activityid`, `activitytype`, `target_name`, `item_list`, "
+				 "`skill_list`, `spell_list`, `description_override`, `goalid`, `goalmethod`, "
+				 "`goalcount`, `delivertonpc`, `zones`, `optional` FROM `task_activities` WHERE "
+				 "`taskid` < %i AND `activityid` < %i ORDER BY taskid, activityid ASC",
+				 MAXTASKS, MAXACTIVITIESPERTASK);
+	else
+		query =
+		    StringFormat("SELECT `taskid`, `step`, `activityid`, `activitytype`, `target_name`, `item_list`, "
+				 "`skill_list`, `spell_list`, `description_override`, `goalid`, `goalmethod`, "
+				 "`goalcount`, `delivertonpc`, `zones`, `optional` FROM `task_activities` WHERE "
+				 "`taskid` = %i AND `activityid` < %i ORDER BY taskid, activityid ASC",
+				 single_task, MAXACTIVITIESPERTASK);
+	return true;
+}
+
 /*
  * This is called once during boot of world
  * We need to load next_id, clean up expired tasks (?), and populate the map
diff --git a/world/shared_tasks.h b/world/shared_tasks.h
index 7ef56d040..4bf7e1ca4 100644
--- a/world/shared_tasks.h
+++ b/world/shared_tasks.h
@@ -49,7 +49,7 @@ public:
 	~SharedTaskManager() {}
 
 	bool LoadSharedTaskState();
-	bool LoadSharedTasks();
+	bool LoadSharedTasks(int single_task = 0);
 
 	bool AppropriateLevel(int id, int level) const;