From 4d167ad22f9b7367639444c441f09b11609a986c Mon Sep 17 00:00:00 2001 From: Mordred Admin Date: Fri, 27 Oct 2017 14:01:50 +0200 Subject: [PATCH] Simplified usage of new database class --- src/servers/Server_Common/Database/DatabaseDef.h | 12 ++++++++++++ src/servers/Server_REST/PlayerMinimal.cpp | 8 +------- src/servers/Server_REST/SapphireAPI.cpp | 8 +------- src/servers/Server_Zone/Actor/PlayerSql.cpp | 7 +------ .../Server_Zone/DebugCommand/DebugCommandHandler.cpp | 7 +------ src/servers/Server_Zone/Inventory/Inventory.cpp | 7 +------ src/servers/Server_Zone/Inventory/ItemContainer.cpp | 7 +------ .../Server_Zone/Network/Handlers/PacketHandlers.cpp | 7 +------ src/servers/Server_Zone/Zone/Zone.cpp | 7 +------ src/servers/Server_Zone/Zone/ZoneMgr.cpp | 7 +------ 10 files changed, 21 insertions(+), 56 deletions(-) create mode 100644 src/servers/Server_Common/Database/DatabaseDef.h diff --git a/src/servers/Server_Common/Database/DatabaseDef.h b/src/servers/Server_Common/Database/DatabaseDef.h new file mode 100644 index 00000000..4009b25c --- /dev/null +++ b/src/servers/Server_Common/Database/DatabaseDef.h @@ -0,0 +1,12 @@ +#ifndef _DATABASEDEF_H +#define _DATABASEDEF_H + +#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include +#include +#include +#include + +extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; + +#endif diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/Server_REST/PlayerMinimal.cpp index f80d1d86..f7fc0d74 100644 --- a/src/servers/Server_REST/PlayerMinimal.cpp +++ b/src/servers/Server_REST/PlayerMinimal.cpp @@ -4,14 +4,8 @@ #include #include -#include -#include -#include -#include +#include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" - -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; extern Core::Data::ExdData g_exdData; namespace Core { diff --git a/src/servers/Server_REST/SapphireAPI.cpp b/src/servers/Server_REST/SapphireAPI.cpp index f4957847..707f917a 100644 --- a/src/servers/Server_REST/SapphireAPI.cpp +++ b/src/servers/Server_REST/SapphireAPI.cpp @@ -10,16 +10,10 @@ #include #include #include -#include -#include -#include -#include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include #include -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; - Core::Network::SapphireAPI::SapphireAPI() { diff --git a/src/servers/Server_Zone/Actor/PlayerSql.cpp b/src/servers/Server_Zone/Actor/PlayerSql.cpp index 31e40e63..336002b9 100644 --- a/src/servers/Server_Zone/Actor/PlayerSql.cpp +++ b/src/servers/Server_Zone/Actor/PlayerSql.cpp @@ -29,13 +29,8 @@ #include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h" #include "src/servers/Server_Zone/Inventory/Inventory.h" -#include -#include -#include -#include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; extern Core::Logger g_log; extern Core::ServerZone g_serverZone; extern Core::ZoneMgr g_zoneMgr; diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp index 8ac5e529..f7428450 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp @@ -30,13 +30,8 @@ #include "src/servers/Server_Zone/Session.h" #include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" -#include -#include -#include -#include +#include -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; extern Core::Scripting::ScriptManager g_scriptMgr; extern Core::Data::ExdData g_exdData; extern Core::Logger g_log; diff --git a/src/servers/Server_Zone/Inventory/Inventory.cpp b/src/servers/Server_Zone/Inventory/Inventory.cpp index 65016199..f7d908ed 100644 --- a/src/servers/Server_Zone/Inventory/Inventory.cpp +++ b/src/servers/Server_Zone/Inventory/Inventory.cpp @@ -17,13 +17,8 @@ #include "src/servers/Server_Zone/Forwards.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h" -#include -#include -#include -#include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; extern Core::Logger g_log; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.cpp b/src/servers/Server_Zone/Inventory/ItemContainer.cpp index 933eeda6..e3a1f7ec 100644 --- a/src/servers/Server_Zone/Inventory/ItemContainer.cpp +++ b/src/servers/Server_Zone/Inventory/ItemContainer.cpp @@ -8,13 +8,8 @@ #include "Item.h" -#include -#include -#include -#include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; extern Core::Logger g_log; Core::ItemContainer::ItemContainer( uint16_t locationId ) : diff --git a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp index 50c50cd1..1942df5b 100644 --- a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp @@ -37,13 +37,8 @@ #include "src/servers/Server_Zone/Action/Action.h" #include "src/servers/Server_Zone/Action/ActionTeleport.h" -#include -#include -#include -#include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; extern Core::Logger g_log; extern Core::ServerZone g_serverZone; extern Core::ZoneMgr g_zoneMgr; diff --git a/src/servers/Server_Zone/Zone/Zone.cpp b/src/servers/Server_Zone/Zone/Zone.cpp index 8f0058a0..0d110220 100644 --- a/src/servers/Server_Zone/Zone/Zone.cpp +++ b/src/servers/Server_Zone/Zone/Zone.cpp @@ -29,13 +29,8 @@ #include -#include -#include -#include -#include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; extern Core::Logger g_log; extern Core::ServerZone g_serverZone; extern Core::Data::ExdData g_exdData; diff --git a/src/servers/Server_Zone/Zone/ZoneMgr.cpp b/src/servers/Server_Zone/Zone/ZoneMgr.cpp index e6de7945..4c4e0894 100644 --- a/src/servers/Server_Zone/Zone/ZoneMgr.cpp +++ b/src/servers/Server_Zone/Zone/ZoneMgr.cpp @@ -7,13 +7,8 @@ #include "ZonePosition.h" -#include -#include -#include -#include -#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" +#include -extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb; extern Core::Logger g_log; extern Core::Data::ExdData g_exdData;