Restructure to remove more things.

common/CMakeLists.txt

@@ -93,6 +93,8 @@ set(common_sources
     spdat.cpp
     spdat_bot.cpp
     strings.cpp
+    strings_legacy.cpp
+    strings_misc.cpp
     struct_strategy.cpp
     textures.cpp
     timer.cpp

common/strings.cpp

@@ -48,14 +48,9 @@
 #include <random>
 #include <string>
 
-//Const char based
-#include "strings_legacy.cpp" // legacy c functions
-#include "strings_misc.cpp" // anything non "Strings" scoped
-
 #ifdef _WINDOWS
 #include <ctype.h>
 #include <functional>
-#include <algorithm>
 #endif
 
 std::string Strings::Random(size_t length)

zone/CMakeLists.txt

@@ -111,6 +111,7 @@ set(zone_sources
     xtargetautohaters.cpp
     zone.cpp
     zone_config.cpp
+    zone_loot.cpp
     zonedb.cpp
     zone_base_data.cpp
     zone_event_scheduler.cpp
@@ -310,6 +311,68 @@ set_target_properties(perl_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE
 set(gm_command_sources
     command.cpp
     bot_command.cpp
+    bot_commands/bot_actionable.cpp
+    bot_commands/bot_appearance.cpp
+    bot_commands/bot_apply_poison.cpp
+    bot_commands/bot_apply_potion.cpp
+    bot_commands/bot_attack.cpp
+    bot_commands/bot_behind_mob.cpp
+    bot_commands/bot_blocked_buffs.cpp
+    bot_commands/bot_bot.cpp
+    bot_commands/bot_bot_settings.cpp
+    bot_commands/bot_cast.cpp
+    bot_commands/bot_class_race_list.cpp
+    bot_commands/bot_click_item.cpp
+    bot_commands/bot_copy_settings.cpp
+    bot_commands/bot_default_settings.cpp
+    bot_commands/bot_depart.cpp
+    bot_commands/bot_discipline.cpp
+    bot_commands/bot_distance_ranged.cpp
+    bot_commands/bot_find_aliases.cpp
+    bot_commands/bot_follow.cpp
+    bot_commands/bot_guard.cpp
+    bot_commands/bot_heal_rotation.cpp
+    bot_commands/bot_help.cpp
+    bot_commands/bot_hold.cpp
+    bot_commands/bot_illusion_block.cpp
+    bot_commands/bot_inventory.cpp
+    bot_commands/bot_item_use.cpp
+    bot_commands/bot_max_melee_range.cpp
+    bot_commands/bot_name.cpp
+    bot_commands/bot_owner_option.cpp
+    bot_commands/bot_pet.cpp
+    bot_commands/bot_pick_lock.cpp
+    bot_commands/bot_pickpocket.cpp
+    bot_commands/bot_precombat.cpp
+    bot_commands/bot_pull.cpp
+    bot_commands/bot_release.cpp
+    bot_commands/bot_set_assistee.cpp
+    bot_commands/bot_sit_hp_percent.cpp
+    bot_commands/bot_sit_in_combat.cpp
+    bot_commands/bot_sit_mana_percent.cpp
+    bot_commands/bot_spell.cpp
+    bot_commands/bot_spell_aggro_checks.cpp
+    bot_commands/bot_spell_announce_cast.cpp
+    bot_commands/bot_spell_delays.cpp
+    bot_commands/bot_spell_engaged_priority.cpp
+    bot_commands/bot_spell_holds.cpp
+    bot_commands/bot_spell_idle_priority.cpp
+    bot_commands/bot_spell_max_hp_pct.cpp
+    bot_commands/bot_spell_max_mana_pct.cpp
+    bot_commands/bot_spell_max_thresholds.cpp
+    bot_commands/bot_spell_min_hp_pct.cpp
+    bot_commands/bot_spell_min_mana_pct.cpp
+    bot_commands/bot_spell_min_thresholds.cpp
+    bot_commands/bot_spell_pursue_priority.cpp
+    bot_commands/bot_spell_resist_limits.cpp
+    bot_commands/bot_spell_target_count.cpp
+    bot_commands/bot_spelltypes.cpp
+    bot_commands/bot_summon.cpp
+    bot_commands/bot_suspend.cpp
+    bot_commands/bot_taunt.cpp
+    bot_commands/bot_timer.cpp
+    bot_commands/bot_track.cpp
+    bot_commands/bot_view_combos.cpp
     gm_commands/acceptrules.cpp
     gm_commands/advnpcspawn.cpp
     gm_commands/aggrozone.cpp

zone/bot_command.cpp

@@ -863,65 +863,3 @@ void SendSpellTypeWindow(Client* c, const Seperator* sep) {
 	c->SendPopupToClient("Spell Types", popup_text.c_str());
 }
 
-#include "bot_commands/actionable.cpp"
-#include "bot_commands/appearance.cpp"
-#include "bot_commands/apply_poison.cpp"
-#include "bot_commands/apply_potion.cpp"
-#include "bot_commands/attack.cpp"
-#include "bot_commands/behind_mob.cpp"
-#include "bot_commands/blocked_buffs.cpp"
-#include "bot_commands/bot.cpp"
-#include "bot_commands/bot_settings.cpp"
-#include "bot_commands/cast.cpp"
-#include "bot_commands/class_race_list.cpp"
-#include "bot_commands/click_item.cpp"
-#include "bot_commands/copy_settings.cpp"
-#include "bot_commands/default_settings.cpp"
-#include "bot_commands/depart.cpp"
-#include "bot_commands/discipline.cpp"
-#include "bot_commands/distance_ranged.cpp"
-#include "bot_commands/find_aliases.cpp"
-#include "bot_commands/follow.cpp"
-#include "bot_commands/guard.cpp"
-#include "bot_commands/heal_rotation.cpp"
-#include "bot_commands/help.cpp"
-#include "bot_commands/hold.cpp"
-#include "bot_commands/illusion_block.cpp"
-#include "bot_commands/inventory.cpp"
-#include "bot_commands/item_use.cpp"
-#include "bot_commands/max_melee_range.cpp"
-#include "bot_commands/name.cpp"
-#include "bot_commands/owner_option.cpp"
-#include "bot_commands/pet.cpp"
-#include "bot_commands/pick_lock.cpp"
-#include "bot_commands/pickpocket.cpp"
-#include "bot_commands/precombat.cpp"
-#include "bot_commands/pull.cpp"
-#include "bot_commands/release.cpp"
-#include "bot_commands/set_assistee.cpp"
-#include "bot_commands/sit_hp_percent.cpp"
-#include "bot_commands/sit_in_combat.cpp"
-#include "bot_commands/sit_mana_percent.cpp"
-#include "bot_commands/spell.cpp"
-#include "bot_commands/spell_aggro_checks.cpp"
-#include "bot_commands/spell_announce_cast.cpp"
-#include "bot_commands/spell_delays.cpp"
-#include "bot_commands/spell_engaged_priority.cpp"
-#include "bot_commands/spell_holds.cpp"
-#include "bot_commands/spell_idle_priority.cpp"
-#include "bot_commands/spell_max_hp_pct.cpp"
-#include "bot_commands/spell_max_mana_pct.cpp"
-#include "bot_commands/spell_max_thresholds.cpp"
-#include "bot_commands/spell_min_hp_pct.cpp"
-#include "bot_commands/spell_min_mana_pct.cpp"
-#include "bot_commands/spell_min_thresholds.cpp"
-#include "bot_commands/spell_pursue_priority.cpp"
-#include "bot_commands/spell_resist_limits.cpp"
-#include "bot_commands/spell_target_count.cpp"
-#include "bot_commands/spelltypes.cpp"
-#include "bot_commands/summon.cpp"
-#include "bot_commands/suspend.cpp"
-#include "bot_commands/taunt.cpp"
-#include "bot_commands/timer.cpp"
-#include "bot_commands/track.cpp"
-#include "bot_commands/view_combos.cpp"

zone/bot_commands/bot_pick_lock.cpp

@@ -1,4 +1,5 @@
 #include "../bot_command.h"
+#include "../doors.h"
 
 void bot_command_pick_lock(Client *c, const Seperator *sep)
 {

zone/gm_commands/find/find_spell.cpp

@@ -1,5 +1,7 @@
 #include "../../client.h"
 
+uint8 GetCommandStatus(std::string command_name);
+
 void FindSpell(Client *c, const Seperator *sep)
 {
 	if (SPDAT_RECORDS <= 0) {

zone/gm_commands/find/find_task.cpp

@@ -1,5 +1,7 @@
 #include "../../client.h"
 
+uint8 GetCommandStatus(std::string command_name);
+
 void FindTask(Client *c, const Seperator *sep)
 {
 	if (!RuleB(TaskSystem, EnableTaskSystem)) {

zone/gm_commands/fixmob.cpp

@@ -1,5 +1,21 @@
 #include "../client.h"
 
+void SendFixMobSubCommands(Client* c)
+{
+	c->Message(Chat::White, "Usage: #fixmob beard [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob beard_color [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob drakkin_details [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob drakkin_heritage [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob drakkin_tattoo [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob face [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob gender [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob hair [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob hair_color [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob helm [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob race [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob texture [Next|Previous]");
+}
+
 void command_fixmob(Client *c, const Seperator *sep)
 {
 	const int arguments = sep->argnum;
@@ -269,18 +285,3 @@ void command_fixmob(Client *c, const Seperator *sep)
 	);
 }
 
-void SendFixMobSubCommands(Client *c)
-{
-	c->Message(Chat::White, "Usage: #fixmob beard [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob beard_color [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob drakkin_details [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob drakkin_heritage [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob drakkin_tattoo [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob face [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob gender [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob hair [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob hair_color [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob helm [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob race [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob texture [Next|Previous]");
-}

zone/gm_commands/set/set_zone.cpp

@@ -1,4 +1,7 @@
 #include "../../client.h"
+#include "../../worldserver.h"
+
+extern WorldServer worldserver;
 
 void SetZoneData(Client *c, const Seperator *sep)
 {

zone/zone.cpp

@@ -3584,5 +3584,3 @@ std::vector<std::string> Zone::GetTimers()
 
 	return v;
 }
-
-#include "zone_loot.cpp"