normalize includes: world

world/cli/cli_bots_disable.cpp

@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/database_schema.h"
+#include "world/world_server_cli.h"
+
+#include "common/database_schema.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::BotsDisable(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_bots_enable.cpp

@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/rulesys.h"
+#include "world/world_server_cli.h"
+
+#include "common/rulesys.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::BotsEnable(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_copy_character.cpp

@@ -1,7 +1,8 @@
-#include "../world_server_cli.h"
-#include "../../common/eqemu_logsys.h"
-#include "../../common/eqemu_logsys_log_aliases.h"
-#include "../worlddb.h"
+#include "world/world_server_cli.h"
+
+#include "common/eqemu_logsys_log_aliases.h"
+#include "common/eqemu_logsys.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::CopyCharacter(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_database_concurrency.cpp

@@ -1,8 +1,10 @@
+#include "world/world_server_cli.h"
+
+#include "common/eqemu_config.h"
+#include "common/repositories/zone_repository.h"
+
+#include <csignal>
 #include <thread>
-#include "../world_server_cli.h"
-#include "../../common/repositories/zone_repository.h"
-#include "../../common/eqemu_config.h"
-#include <signal.h>
 
 Database db;
 Database db2;

world/cli/cli_database_dump.cpp

@@ -1,5 +1,6 @@
-#include "../world_server_cli.h"
-#include "../../common/database/database_dump_service.h"
+#include "world/world_server_cli.h"
+
+#include "common/database/database_dump_service.h"
 
 void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_database_get_schema.cpp

@@ -1,6 +1,9 @@
-#include "../world_server_cli.h"
-#include "../../common/database_schema.h"
-#include "../../common/json/json.h"
+#include "world/world_server_cli.h"
+
+#include "common/database_schema.h"
+#include "common/json/json.h"
+
+#include <iostream>
 
 void WorldserverCLI::DatabaseGetSchema(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
@@ -62,8 +65,5 @@ void WorldserverCLI::DatabaseGetSchema(int argc, char **argv, argh::parser &cmd,
 	schema["version_tables"] = version_tables_json;
 	schema["bot_tables"]     = bot_tables_json;
 
-	std::stringstream payload;
-	payload << schema;
-
-	std::cout << payload.str() << std::endl;
+	std::cout << schema << std::endl;
 }

world/cli/cli_database_set_account_status.cpp

@@ -1,5 +1,5 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
+#include "world/world_server_cli.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_database_updates.cpp

@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/database/database_update.h"
+#include "world/world_server_cli.h"
+
+#include "common/database/database_update.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::DatabaseUpdates(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_database_version.cpp

@@ -1,7 +1,10 @@
-#include "../world_server_cli.h"
-#include "../../common/version.h"
-#include "../../common/json/json.h"
-#include "../../common/rulesys.h"
+#include "world/world_server_cli.h"
+
+#include "common/json/json.h"
+#include "common/rulesys.h"
+#include "common/version.h"
+
+#include <iostream>
 
 void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_etl_get_settings.cpp

@@ -1,7 +1,8 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/events/player_event_logs.h"
-#include "../../common/json/json.h"
+#include "world/world_server_cli.h"
+
+#include "common/events/player_event_logs.h"
+#include "common/json/json.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::EtlGetSettings(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_mercs_disable.cpp

@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/database_schema.h"
+#include "world/world_server_cli.h"
+
+#include "common/database_schema.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::MercsDisable(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_mercs_enable.cpp

@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/database_schema.h"
+#include "world/world_server_cli.h"
+
+#include "common/database_schema.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::MercsEnable(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_test.cpp

@@ -1,9 +1,11 @@
-#include "../world_server_cli.h"
-#include <cereal/archives/json.hpp>
-#include <cereal/types/vector.hpp>
+#include "world/world_server_cli.h"
+
+#include "common/events/player_events.h"
+#include "common/memory/ksm.hpp"
+
+#include "cereal/archives/json.hpp"
+#include "cereal/types/vector.hpp"
 #include <iomanip>
-#include "../../common/events/player_events.h"
-#include "../../common/memory/ksm.hpp"
 
 void WorldserverCLI::TestCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_test_colors.cpp

@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../../common/zone_store.h"
-#include "../../common/termcolor/rang.hpp"
+#include "world/world_server_cli.h"
+
+#include "common/termcolor/rang.hpp"
+#include "common/zone_store.h"
 
 void WorldserverCLI::TestColors(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_test_expansion.cpp

@@ -1,9 +1,10 @@
-#include "../world_server_cli.h"
-#include "../../common/rulesys.h"
-#include "../../common/repositories/content_flags_repository.h"
-#include "../../common/content/world_content_service.h"
-#include "../../common/repositories/criteria/content_filter_criteria.h"
-#include "../worlddb.h"
+#include "world/world_server_cli.h"
+
+#include "common/content/world_content_service.h"
+#include "common/repositories/content_flags_repository.h"
+#include "common/repositories/criteria/content_filter_criteria.h"
+#include "common/rulesys.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::ExpansionTestCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_test_repository.cpp

@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../../common/repositories/instance_list_repository.h"
-#include "../worlddb.h"
+#include "world/world_server_cli.h"
+
+#include "common/repositories/instance_list_repository.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::TestRepository(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_test_repository_2.cpp

@@ -1,6 +1,7 @@
-#include "../world_server_cli.h"
-#include "../worlddb.h"
-#include "../../common/repositories/zone_repository.h"
+#include "world/world_server_cli.h"
+
+#include "common/repositories/zone_repository.h"
+#include "world/worlddb.h"
 
 void WorldserverCLI::TestRepository2(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_test_string_benchmark.cpp

@@ -1,8 +1,10 @@
-#include "../world_server_cli.h"
-#include <cereal/archives/json.hpp>
-#include <cereal/types/vector.hpp>
-#include "../../common/events/player_events.h"
-#include "../../common/timer.h"
+#include "world/world_server_cli.h"
+
+#include "common/events/player_events.h"
+#include "common/timer.h"
+
+#include "cereal/archives/json.hpp"
+#include "cereal/types/vector.hpp"
 
 void WorldserverCLI::TestStringBenchmarkCommand(int argc, char **argv, argh::parser &cmd, std::string &description)
 {

world/cli/cli_version.cpp

@@ -1,6 +1,9 @@
-#include "../world_server_cli.h"
-#include "../../common/json/json.h"
-#include "../../common/version.h"
+#include "world/world_server_cli.h"
+
+#include "common/json/json.h"
+#include "common/version.h"
+
+#include <iostream>
 
 void WorldserverCLI::Version(int argc, char **argv, argh::parser &cmd, std::string &description)
 {