change: Guild manager stuff

add: Callback AsyncQuery.
fix: Multiple missing `txn.commit()`.

.gitignore

@@ -406,6 +406,9 @@ FodyWeavers.xsd
 
 # CMake
 cmake-build-*/
+cmake/
+CMakeFiles/
+CMakeCache.txt
 
 # Mongo Explorer plugin
 .idea/**/mongoSettings.xml
@@ -442,3 +445,6 @@ fabric.properties
 
 # Debug folder
 test/
+
+# Vcpkg
+vcpkg_installed/

.vscode/launch.json

@@ -5,7 +5,7 @@
             "request": "launch",
             "name": "Debug portfile(s)",
             "cmakeDebugType": "external",
-            "pipeName": "\\\\.\\pipe\\vcpkg_ext_portfile_dbg",
+            "pipeName": "/tmp/vcpkg_ext_portfile_dbg",
             "preLaunchTask": "Debug vcpkg commands"
         }
     ]

.vscode/settings.json

@@ -12,7 +12,92 @@
     "xhash": "cpp",
     "xstring": "cpp",
     "xtree": "cpp",
-    "xutility": "cpp"
+    "xutility": "cpp",
+    "sstream": "cpp",
+    "fstream": "cpp",
+    "atomic": "cpp",
+    "hash_map": "cpp",
+    "bit": "cpp",
+    "bitset": "cpp",
+    "cctype": "cpp",
+    "charconv": "cpp",
+    "chrono": "cpp",
+    "cinttypes": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "codecvt": "cpp",
+    "compare": "cpp",
+    "complex": "cpp",
+    "concepts": "cpp",
+    "condition_variable": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "map": "cpp",
+    "set": "cpp",
+    "string": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "exception": "cpp",
+    "expected": "cpp",
+    "algorithm": "cpp",
+    "functional": "cpp",
+    "iterator": "cpp",
+    "memory": "cpp",
+    "memory_resource": "cpp",
+    "numeric": "cpp",
+    "optional": "cpp",
+    "random": "cpp",
+    "ratio": "cpp",
+    "source_location": "cpp",
+    "string_view": "cpp",
+    "system_error": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "format": "cpp",
+    "future": "cpp",
+    "iomanip": "cpp",
+    "iosfwd": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numbers": "cpp",
+    "ostream": "cpp",
+    "ranges": "cpp",
+    "semaphore": "cpp",
+    "shared_mutex": "cpp",
+    "span": "cpp",
+    "stdexcept": "cpp",
+    "stop_token": "cpp",
+    "streambuf": "cpp",
+    "thread": "cpp",
+    "typeinfo": "cpp",
+    "variant": "cpp"
   },
-  "editor.formatOnSave": false
+  // "editor.formatOnSave": false,
+  "vcpkg.target.useManifest": false,
+  "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
+  "cmake.configureArgs": [
+    "-DVCPKG_APPLOCAL_DEPS=ON",
+    "-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON",
+    "-DVCPKG_TARGET_TRIPLET=x64-linux",
+    "-DVCPKG_MANIFEST_MODE=OFF"
+  ],
+  "vcpkg.general.enable": true,
+  "vcpkg.target.hostTriplet": "x64-linux",
+  "vcpkg.target.defaultTriplet": "x64-linux",
+  "vcpkg.target.useStaticLib": false,
+  "cmake.configureSettings": {
+    "CMAKE_TOOLCHAIN_FILE": "~/.local/share/vcpkg/scripts/buildsystems/vcpkg.cmake"
+  },
+  "vcpkg.target.installDependencies": true,
+  "vcpkg.target.preferSystemLibs": false
 }

README.md

@@ -60,7 +60,7 @@ Install `vcpkg` according to the [latest instructions](https://vcpkg.io/en/getti
 
 Build and install the required libraries:
 ```shell
-vcpkg install cryptopp effolkronium-random libevent lzo fmt spdlog argon2 libpq
+vcpkg install cryptopp effolkronium-random libevent lzo fmt spdlog argon2 libpq libpqxx
 ```
 
 #### Building the binaries

TODO.md

@@ -0,0 +1,17 @@
+# The list
+
+- [ ] Database initialization
+  - [x] Main (Most important duh)
+  - [ ] ClientManager
+  - [ ] ClientManagerBoot
+  - [ ] ClientManagerEventFlag
+  - [ ] ClientManagerGuild
+  - [ ] ClientManagerHorseName
+  - [ ] ClientManagerLogin
+  - [ ] ClientManagerPlayer
+  - [x] DBManager
+  - [ ] GuildManager
+  - [ ] ItemAwardManager
+  - [x] ItemIDRangeManager
+  - [x] Marriage
+  - [x] Monarch

common/version.h

@@ -0,0 +1,15 @@
+#ifndef __INC_METIN_II_VERSION_H__
+#define __INC_METIN_II_VERSION_H__
+
+#include <ostream>
+
+#define __REVISION__ "c9bd9a7"
+#define __COMMIT_DATE__ "2025-06-06 20:26:23 +0100"
+#define __COMMIT_TAG__ "0.4.1"
+#define __OS_NAME__ "Linux-5.15.167.4-microsoft-standard-WSL2"
+#define __COMPILER__ "GNU 9.5.0"
+#define __CPU_TARGET__ "x86_64"
+
+void WriteVersion();
+
+#endif

src/db/src/Cache.h

@@ -34,7 +34,6 @@ class CPlayerTableCache : public cache<TPlayerTable>
 class CItemPriceListTableCache : public cache<TItemPriceListTable>
 {
 public:
-
 	/// Constructor
 	/**
 	 * 캐시 만료 시간을 설정한다.
@@ -54,7 +53,6 @@ class CItemPriceListTableCache : public cache< TItemPriceListTable >
 	virtual void OnFlush(void);
 
 private:
-
 	static const int s_nMinFlushSec; ///< Minimum cache expire time
 };
 // END_OF_MYSHOP_PRICE_LIST

src/db/src/ClientManager.cpp

@@ -23,7 +23,8 @@ extern int g_iItemCacheFlushSeconds;
 extern int g_test_server;
 extern std::string g_stLocale;
 extern std::string g_stLocaleNameColumn;
-bool CreateItemTableFromRes(MYSQL_RES * res, std::vector<TPlayerItem> * pVec, DWORD dwPID);
+
+bool CreateItemTableFromRes(pqxx::result *res, std::vector<TPlayerItem> *pVec, DWORD dwPID);
 
 DWORD g_dwUsageMax = 0;
 DWORD g_dwUsageAvg = 0;
@@ -58,7 +59,8 @@ static void AcceptConnection(
 	bufferevent_enable(bev, EV_READ | EV_WRITE);
 }
 
-static void AcceptError(evconnlistener *listener, void *ctx) {
+static void AcceptError(evconnlistener *listener, void *ctx)
+{
 	struct event_base *base = evconnlistener_get_base(listener);
 	int err = EVUTIL_SOCKET_ERROR();
 	SPDLOG_CRITICAL("Got an error {} ({}) on the listener. Shutting down.", err, evutil_socket_error_to_string(err));
@@ -66,7 +68,8 @@ static void AcceptError(evconnlistener *listener, void *ctx) {
 	event_base_loopexit(base, nullptr);
 }
 
-static void DescReadHandler(bufferevent *bev, void *ctx) {
+static void DescReadHandler(bufferevent *bev, void *ctx)
+{
 	auto *peer = (CPeer *)ctx;
 
 	if (peer == CClientManager::Instance().GetAuthPeer())
@@ -75,14 +78,16 @@ static void DescReadHandler(bufferevent *bev, void *ctx) {
 	CClientManager::Instance().ProcessPackets(peer);
 }
 
-static void DescWriteHandler(bufferevent *bev, void *ctx) {
+static void DescWriteHandler(bufferevent *bev, void *ctx)
+{
 	auto *peer = (CPeer *)ctx;
 
 	if (peer == CClientManager::Instance().GetAuthPeer())
 		SPDLOG_TRACE("AUTH_PEER_WRITE: size {}", peer->GetSendLength());
 }
 
-static void DescEventHandler(bufferevent *bev, short events, void *ctx) {
+static void DescEventHandler(bufferevent *bev, short events, void *ctx)
+{
 	auto *peer = (CPeer *)ctx;
 
 	if (events & BEV_EVENT_ERROR)
@@ -96,8 +101,7 @@ static void DescEventHandler(bufferevent *bev, short events, void *ctx) {
 		CClientManager::Instance().RemovePeer(peer);
 }
 
-CClientManager::CClientManager() :
+CClientManager::CClientManager() : m_pkAuthPeer(NULL),
-	m_pkAuthPeer(NULL),
 								   m_iPlayerIDStart(0),
 								   m_iPlayerDeleteLevelLimit(0),
 								   m_iPlayerDeleteLevelLimitLower(0),
@@ -137,12 +141,14 @@ void CClientManager::Destroy()
 	m_peerList.clear();
 
 	// Free the libevent resources
-	if (m_listener) {
+	if (m_listener)
+	{
 		evconnlistener_free(m_listener);
 		m_listener = nullptr;
 	}
 
-    if (m_base) {
+	if (m_base)
+	{
 		event_base_free(m_base);
 		m_base = nullptr;
 	}
@@ -187,7 +193,8 @@ bool CClientManager::Initialize()
 
 	// Create a new libevent base and listen for new connections
 	m_base = event_base_new();
-    if (!m_base) {
+	if (!m_base)
+	{
 		SPDLOG_ERROR("Libevent base initialization FAILED!");
 		return false;
 	}
@@ -204,9 +211,9 @@ bool CClientManager::Initialize()
 		m_base,
 		AcceptConnection, this,
 		LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, -1,
-        (const sockaddr*)&sin, sizeof(sin)
+		(const sockaddr *)&sin, sizeof(sin));
-    );
+	if (!m_listener)
-    if (!m_listener) {
+	{
 		SPDLOG_ERROR("Libevent listener initialization FAILED!");
 		return false;
 	}
@@ -240,13 +247,8 @@ bool CClientManager::Initialize()
 
 	SPDLOG_DEBUG("CHINA_EVENT_SERVER {}", CClientManager::instance().IsChinaEventServer() ? "true" : "false");
 
-
 	LoadEventFlag();
 
-	// database character-set을 강제로 맞춤
-	if (g_stLocale == "big5" || g_stLocale == "sjis")
-	    CDBManager::instance().QueryLocaleSet();
-
 	return true;
 }
 
@@ -257,17 +259,18 @@ void CClientManager::MainLoop()
 	SPDLOG_DEBUG("ClientManager pointer is {}", (void *)this);
 
 	// 메인루프
-	while (!m_bShutdowned)
+	// TODO Look at this
-	{
+	// while (!m_bShutdowned)
-		while ((tmp = CDBManager::instance().PopResult()))
+	// {
-		{
+	// 	while ((tmp = CDBManager::instance().PopResult()))
-			AnalyzeQueryResult(tmp);
+	// 	{
-			delete tmp;
+	// 		AnalyzeQueryResult(tmp);
-		}
+	// 		delete tmp;
+	// 	}
 
-		if (!Process())
+	// 	if (!Process())
-			break;
+	// 		break;
-    }
+	// }
 
 	//
 	// 메인루프 종료처리
@@ -288,7 +291,6 @@ void CClientManager::MainLoop()
 	}
 	m_map_playerCache.clear();
 
-	
 	itertype(m_map_itemCache) it2 = m_map_itemCache.begin();
 	// 아이템 플러쉬
 	while (it2 != m_map_itemCache.end())
@@ -471,7 +473,8 @@ void CClientManager::QUERY_BOOT(CPeer* peer, TPacketGDBoot * p)
 	size_t num_monarch_candidacy = CMonarch::instance().MonarchCandidacySize();
 	peer->EncodeWORD(sizeof(MonarchCandidacy));
 	peer->EncodeWORD(num_monarch_candidacy);
-	if (num_monarch_candidacy != 0) {
+	if (num_monarch_candidacy != 0)
+	{
 		peer->Encode(&rVecMonarchCandidacy[0], sizeof(MonarchCandidacy) * num_monarch_candidacy);
 	}
 	// END_MONARCE
@@ -522,24 +525,53 @@ void CClientManager::QUERY_QUEST_SAVE(CPeer * pkPeer, TQuestTable * pTable, DWOR
 
 	int iSize = dwLen / sizeof(TQuestTable);
 
-	char szQuery[1024];
+	// We move to prepared queries for speed and SAFETY
+	std::vector<TQuestTable> inserts;
+	std::vector<TQuestTable> deletes;
 
 	for (int i = 0; i < iSize; ++i, ++pTable)
 	{
 		if (pTable->lValue == 0)
-		{
+			deletes.push_back(*pTable);
-			snprintf(szQuery, sizeof(szQuery),
-					"DELETE FROM quest%s WHERE dwPID=%d AND szName='%s' AND szState='%s'",
-					GetTablePostfix(), pTable->dwPID, pTable->szName, pTable->szState);
-		}
 		else
-		{
+			inserts.push_back(*pTable);
-			snprintf(szQuery, sizeof(szQuery),
-					"REPLACE INTO quest%s (dwPID, szName, szState, lValue) VALUES(%d, '%s', '%s', %d)",
-					GetTablePostfix(), pTable->dwPID, pTable->szName, pTable->szState, pTable->lValue);
 	}
 
-		CDBManager::instance().ReturnQuery(szQuery, QID_QUEST_SAVE, pkPeer->GetHandle(), NULL);
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
+
+	// Prepare statements
+	static bool prepared = false;
+	if (!prepared)
+	{
+		conn->prepare("delete_quest",
+					  "DELETE FROM player.quest WHERE player_id = $1 AND name = $2 AND state = $3");
+
+		conn->prepare("upsert_quest",
+					  "INSERT INTO player.quest (player_id, name, state, value) VALUES ($1, $2, $3, $4) ON CONFLICT (player_id, name, state) DO UPDATE SET value = EXCLUDED.value");
+
+		prepared = true;
+	}
+
+	try
+	{
+		pqxx::work txn{*conn};
+
+		for (const auto &row : deletes)
+		{
+			txn.exec_prepared("delete_quest", row.dwPID, row.szName, row.szState);
+		}
+
+		for (const auto &row : inserts)
+		{
+			txn.exec_prepared("upsert_quest", row.dwPID, row.szName, row.szState, row.lValue);
+		}
+
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CClientManager::QUERY_QUEST_SAVE] Query error: {}", e.what());
 	}
 }
 
@@ -552,26 +584,30 @@ void CClientManager::QUERY_SAFEBOX_LOAD(CPeer * pkPeer, DWORD dwHandle, TSafebox
 	pi->ip[0] = bMall ? 1 : 0;
 	strlcpy(pi->login, packet->szLogin, sizeof(pi->login));
 
-	char szQuery[QUERY_MAX_LEN];
+	CDBManager::instance().AsyncQuery(
-	snprintf(szQuery, sizeof(szQuery),
+		"SELECT account_id, size, password FROM player.safebox WHERE account_id = $1",
-			"SELECT account_id, size, password FROM safebox%s WHERE account_id=%u",
+		pqxx::params(packet->dwID),
-			GetTablePostfix(), packet->dwID);
+		[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
-
+		{
-    SPDLOG_TRACE("HEADER_GD_SAFEBOX_LOAD (handle: {} account.id {} is_mall {})", dwHandle, packet->dwID, bMall ? 1 : 0);
+			if (!error.empty())
-
+			{
-	CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_LOAD, pkPeer->GetHandle(), pi);
+				return;
 			}
 
-void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
+			SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_LOAD");
+			CClientManager::RESULT_SAFEBOX_LOAD(pkPeer, pi, result);
+		});
+
+	SPDLOG_TRACE("HEADER_GD_SAFEBOX_LOAD (handle: {} account.id {} is_mall {})", dwHandle, packet->dwID, bMall ? 1 : 0);
+}
+
+void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg)
 {
-	CQueryInfo * qi = (CQueryInfo *) msg->pvUserData;
-	ClientHandleInfo * pi = (ClientHandleInfo *) qi->pvData;
 	DWORD dwHandle = pi->dwHandle;
 
-	// 여기에서 사용하는 account_index는 쿼리 순서를 말한다.
+	// The account_index used here refers to the query order.
-	// 첫번째 패스워드 알아내기 위해 하는 쿼리가 0
+	// The first query to retrieve the password is 0.
-	// 두번째 실제 데이터를 얻어놓는 쿼리가 1
+	// The second query to fetch the actual data is 1.
-
 	if (pi->account_index == 0)
 	{
 		char szSafeboxPassword[SAFEBOX_PASSWORD_MAX_LEN + 1];
@@ -580,9 +616,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 		TSafeboxTable *pSafebox = new TSafeboxTable;
 		memset(pSafebox, 0, sizeof(TSafeboxTable));
 
-		SQLResult * res = msg->Get();
+		if (msg.size() == 0)
-
-		if (res->uiNumRows == 0)
 		{
 			if (strcmp("000000", szSafeboxPassword))
 			{
@@ -593,32 +627,38 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 		}
 		else
 		{
-			MYSQL_ROW row = mysql_fetch_row(res->pSQLResult);
+			pqxx::row row = msg[0];
+			// account_id, size, password
+			auto account_id = row[0].c_str();
+			auto size = row[1].c_str();
+			auto password = row[2].c_str();
 
-			// 비밀번호가 틀리면..
+			// If the password is incorrect...
-			if (((!row[2] || !*row[2]) && strcmp("000000", szSafeboxPassword)) ||
+			if (((!password || !*password) && strcmp("000000", szSafeboxPassword)) ||
-				((row[2] && *row[2]) && strcmp(row[2], szSafeboxPassword)))
+				((password && *password) && strcmp(password, szSafeboxPassword)))
 			{
 				pkPeer->EncodeHeader(HEADER_DG_SAFEBOX_WRONG_PASSWORD, dwHandle, 0);
 				delete pi;
 				return;
 			}
 
-			if (!row[0])
+			if (!account_id)
 				pSafebox->dwID = 0;
 			else
-				str_to_number(pSafebox->dwID, row[0]);
+				str_to_number(pSafebox->dwID, account_id);
 
-			if (!row[1])
+			if (!size)
 				pSafebox->bSize = 0;
 			else
-				str_to_number(pSafebox->bSize, row[1]);
+				str_to_number(pSafebox->bSize, size);
+
 			/*
 			if (!row[3])
 			pSafebox->dwGold = 0;
 			else
 			pSafebox->dwGold = atoi(row[3]);
 			*/
+
 			if (pi->ip[0] == 1)
 			{
 				pSafebox->bSize = 1;
@@ -632,27 +672,32 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 			pSafebox->dwID = pi->account_id;
 
 		pi->pSafebox = pSafebox;
-
-		char szQuery[512];
-		snprintf(szQuery, sizeof(szQuery), 
-				"SELECT id, window+0, pos, count, vnum, socket0, socket1, socket2, "
-				"attrtype0, attrvalue0, "
-				"attrtype1, attrvalue1, "
-				"attrtype2, attrvalue2, "
-				"attrtype3, attrvalue3, "
-				"attrtype4, attrvalue4, "
-				"attrtype5, attrvalue5, "
-				"attrtype6, attrvalue6 "
-				"FROM item%s WHERE owner_id=%d AND window='%s'",
-				GetTablePostfix(), pi->account_id, pi->ip[0] == 0 ? "SAFEBOX" : "MALL");
-
 		pi->account_index = 1;
 
-		CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_LOAD, pkPeer->GetHandle(), pi);
+		CDBManager::instance().AsyncQuery(
+			"SELECT id, window_bits, position, count, vnum, socket_0, socket_1, socket_2, "
+			"attr_type_0, attr_value_0, "
+			"attr_type_1, attr_value_1, "
+			"attr_type_2, attr_value_2, "
+			"attr_type_3, attr_value_3, "
+			"attr_type_4, attr_value_4, "
+			"attr_type_5, attr_value_5, "
+			"attr_type_6, attr_value_6 "
+			"FROM player.item WHERE owner_id = $1 AND window = $2",
+			pqxx::params{pi->account_id, pi->ip[0] == 0 ? "SAFEBOX" : "MALL"},
+			[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
+			{
+				if (!error.empty())
+				{
+					return;
+				}
+
+				SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_LOAD");
+				CClientManager::RESULT_SAFEBOX_LOAD(pkPeer, pi, result);
+			});
 	}
 	else
 	{
-
 		if (!pi->pSafebox)
 		{
 			SPDLOG_ERROR("null safebox pointer!");
@@ -660,10 +705,9 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 			return;
 		}
 
-
+		// Since there was an error in the query, responding would make it look like the warehouse is empty,
-		// 쿼리에 에러가 있었으므로 응답할 경우 창고가 비어있는 것 처럼
+		// so it's better not to open the warehouse at all.
-		// 보이기 때문에 창고가 아얘 안열리는게 나음
+		if (msg.size() == 0)
-		if (!msg->Get()->pSQLResult)
 		{
 			SPDLOG_ERROR("null safebox result");
 			delete pi;
@@ -671,7 +715,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 		}
 
 		static std::vector<TPlayerItem> s_items;
-		CreateItemTableFromRes(msg->Get()->pSQLResult, &s_items, pi->account_id);
+		CreateItemTableFromRes(&msg, &s_items, pi->account_id);
 
 		std::set<TItemAward *> *pSet = ItemAwardManager::instance().GetByLogin(pi->login);
 
@@ -703,7 +747,20 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 
 				typeof(pSet->begin()) it = pSet->begin();
 
-				char szQuery[512];
+				auto pool = CDBManager::instance().GetConnectionPool();
+				auto conn = pool->acquire();
+
+				pqxx::work txn{*conn};
+
+				static bool prepared = false;
+				if (!prepared)
+				{
+					conn->prepare("result_safebox_load_insert_item",
+								  "INSERT INTO player.item (id, owner_id, window, position, vnum, count, socket_0, socket_1, socket_2) "
+								  "VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id");
+
+					prepared = true;
+				}
 
 				while (it != pSet->end())
 				{
@@ -769,12 +826,22 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 					{
 						switch (dwItemVnum)
 						{
-							case 72723: case 72724: case 72725: case 72726:
+						case 72723:
-							case 72727: case 72728: case 72729: case 72730:
+						case 72724:
-							// 무시무시하지만 이전에 하던 걸 고치기는 무섭고...
+						case 72725:
-							// 그래서 그냥 하드 코딩. 선물 상자용 자동물약 아이템들.
+						case 72726:
-							case 76004: case 76005: case 76021: case 76022:
+						case 72727:
-							case 79012: case 79013:
+						case 72728:
+						case 72729:
+						case 72730:
+						// It's terrifying, but fixing the old implementation is even scarier...
+						// So just hardcoding it. Auto potion items for gift boxes.
+						case 76004:
+						case 76005:
+						case 76021:
+						case 76022:
+						case 79012:
+						case 79013:
 							if (pItemAward->dwSocket2 == 0)
 							{
 								dwSocket2 = pItemTable->alValues[0];
@@ -795,17 +862,20 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 
 					{
 						itertype(m_map_itemTableByVnum) it = m_map_itemTableByVnum.find(dwItemVnum);
+
 						if (it == m_map_itemTableByVnum.end())
 						{
 							SPDLOG_ERROR("Invalid item(vnum : {}). It is not in m_map_itemTableByVnum.", dwItemVnum);
 							continue;
 						}
+
 						TItemTable *item_table = it->second;
 						if (item_table == NULL)
 						{
 							SPDLOG_ERROR("Invalid item_table (vnum : {}). It's value is NULL in m_map_itemTableByVnum.", dwItemVnum);
 							continue;
 						}
+
 						if (0 == pItemAward->dwSocket0)
 						{
 							for (int i = 0; i < ITEM_LIMIT_MAX_NUM; i++)
@@ -830,26 +900,24 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 								}
 							}
 						}
+					}
 
-						snprintf(szQuery, sizeof(szQuery), 
+					try
-								"INSERT INTO item%s (id, owner_id, window, pos, vnum, count, socket0, socket1, socket2) "
+					{
-								"VALUES(%u, %u, '%s', %d, %u, %u, %u, %u, %u)",
+						pqxx::result res = txn.exec_prepared(
-								GetTablePostfix(),
+							"result_safebox_load_insert_item",
 							GainItemID(),
 							pi->account_id,
 							pi->ip[0] == 0 ? "SAFEBOX" : "MALL",
 							iPos,
 							pItemAward->dwVnum, pItemAward->dwCount, pItemAward->dwSocket0, pItemAward->dwSocket1, dwSocket2);
-					}
 
-					std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+						SPDLOG_DEBUG("SAFEBOX Query");
-					SQLResult * pRes = pmsg->Get();
-					SPDLOG_DEBUG("SAFEBOX Query : [{}]", szQuery);
 
-					if (pRes->uiAffectedRows == 0 || pRes->uiInsertID == 0 || pRes->uiAffectedRows == (uint32_t)-1)
+						if (res.size() == 0)
 							break;
 
-					item.id = pmsg->Get()->uiInsertID;
+						item.id = res[0][0].as<DWORD>();
 						item.window = pi->ip[0] == 0 ? SAFEBOX : MALL,
 						item.pos = iPos;
 						item.count = pItemAward->dwCount;
@@ -862,6 +930,14 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 						vec_dwFinishedAwardID.push_back(std::make_pair(pItemAward->dwID, item.id));
 						grid.Put(iPos, 1, it->second->bSize);
 					}
+					catch (const std::exception &e)
+					{
+						SPDLOG_ERROR("[CClientManager::RESULT_SAFEBOX_LOAD] Query error: {}", e.what());
+						continue;
+					}
+				}
+
+				txn.commit();
 
 				for (DWORD i = 0; i < vec_dwFinishedAwardID.size(); ++i)
 					ItemAwardManager::instance().Taken(vec_dwFinishedAwardID[i].first, vec_dwFinishedAwardID[i].second);
@@ -884,28 +960,30 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg)
 void CClientManager::QUERY_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangeSizePacket *p)
 {
 	ClientHandleInfo *pi = new ClientHandleInfo(dwHandle);
-	pi->account_index = p->bSize;	// account_index를 사이즈로 임시로 사용
+	pi->account_index = p->bSize; // Temporarily use account_index as size
 
-	char szQuery[QUERY_MAX_LEN];
+	CDBManager::instance().AsyncQuery(
-
+		p->bSize == 1 ? "INSERT INTO player.safebox (size, account_id) VALUES($1, $2) RETURNING id" : "UPDATE player.safebox SET size = $1 WHERE account_id = $2 RETURNING id",
-	if (p->bSize == 1)
+		pqxx::params{p->bSize, p->dwID},
-		snprintf(szQuery, sizeof(szQuery), "INSERT INTO safebox%s (account_id, size) VALUES(%u, %u)", GetTablePostfix(), p->dwID, p->bSize);
+		[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
-	else
+		{
-		snprintf(szQuery, sizeof(szQuery), "UPDATE safebox%s SET size=%u WHERE account_id=%u", GetTablePostfix(), p->bSize, p->dwID);
+			if (!error.empty())
-
+			{
-	CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_CHANGE_SIZE, pkPeer->GetHandle(), pi);
+				return;
 			}
 
-void CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(CPeer * pkPeer, SQLMsg * msg)
+			CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(pkPeer, pi, result);
+		});
+}
+
+void CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg)
 {
-	CQueryInfo * qi = (CQueryInfo *) msg->pvUserData;
+	DWORD dwHandle = pi->dwHandle;
-	ClientHandleInfo * p = (ClientHandleInfo *) qi->pvData;
+	BYTE bSize = pi->account_index;
-	DWORD dwHandle = p->dwHandle;
-	BYTE bSize = p->account_index;
 
-	delete p;
+	delete pi;
 
-	if (msg->Get()->uiNumRows > 0)
+	if (msg.size() > 0)
 	{
 		pkPeer->EncodeHeader(HEADER_DG_SAFEBOX_CHANGE_SIZE, dwHandle, sizeof(BYTE));
 		pkPeer->EncodeBYTE(bSize);
@@ -919,48 +997,58 @@ void CClientManager::QUERY_SAFEBOX_CHANGE_PASSWORD(CPeer * pkPeer, DWORD dwHandl
 	strlcpy(pi->login, p->szOldPassword, sizeof(pi->login));
 	pi->account_id = p->dwID;
 
-	char szQuery[QUERY_MAX_LEN];
+	CDBManager::instance().AsyncQuery(
-	snprintf(szQuery, sizeof(szQuery), "SELECT password FROM safebox%s WHERE account_id=%u", GetTablePostfix(), p->dwID);
+		"SELECT password FROM player.safebox WHERE account_id = $1",
-
+		pqxx::params{p->dwID},
-	CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_CHANGE_PASSWORD, pkPeer->GetHandle(), pi);
+		[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
+		{
+			if (!error.empty())
+			{
+				return;
 			}
 
-void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer * pkPeer, SQLMsg * msg)
+			CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(pkPeer, pi, result);
+		});
+}
+
+void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg)
 {
-	CQueryInfo * qi = (CQueryInfo *) msg->pvUserData;
+	DWORD dwHandle = pi->dwHandle;
-	ClientHandleInfo * p = (ClientHandleInfo *) qi->pvData;
-	DWORD dwHandle = p->dwHandle;
 
-	if (msg->Get()->uiNumRows > 0)
+	if (msg.size() > 0)
 	{
-		MYSQL_ROW row = mysql_fetch_row(msg->Get()->pSQLResult);
+		auto password = msg[0][0].c_str();
 
-		if (row[0] && *row[0] && !strcasecmp(row[0], p->login) || (!row[0] || !*row[0]) && !strcmp("000000", p->login))
+		if (password && *password && !strcasecmp(password, pi->login) || (!password || !*password) && !strcmp("000000", pi->login))
 		{
-			char szQuery[QUERY_MAX_LEN];
+			CDBManager::instance().AsyncQuery(
-			char escape_pwd[64];
+				"UPDATE player.safebox SET password = $1 WHERE account_id = $2 RETURNING id",
-			CDBManager::instance().EscapeString(escape_pwd, p->safebox_password, strlen(p->safebox_password));
+				pqxx::params{pi->safebox_password, pi->account_id},
+				[this, pkPeer, pi](const pqxx::result &result, const std::string &error)
+				{
+					if (!error.empty())
+					{
+						return;
+					}
 
-			snprintf(szQuery, sizeof(szQuery), "UPDATE safebox%s SET password='%s' WHERE account_id=%u", GetTablePostfix(), escape_pwd, p->account_id);
+					CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(pkPeer, pi, result);
+				});
 
-			CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_CHANGE_PASSWORD_SECOND, pkPeer->GetHandle(), p);
 			return;
 		}
 	}
 
-	delete p;
+	delete pi;
 
 	// Wrong old password
 	pkPeer->EncodeHeader(HEADER_DG_SAFEBOX_CHANGE_PASSWORD_ANSWER, dwHandle, sizeof(BYTE));
 	pkPeer->EncodeBYTE(0);
 }
 
-void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer * pkPeer, SQLMsg * msg)
+void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg)
 {
-	CQueryInfo * qi = (CQueryInfo *) msg->pvUserData;
+	DWORD dwHandle = pi->dwHandle;
-	ClientHandleInfo * p = (ClientHandleInfo *) qi->pvData;
+	delete pi;
-	DWORD dwHandle = p->dwHandle;
-	delete p;
 
 	pkPeer->EncodeHeader(HEADER_DG_SAFEBOX_CHANGE_PASSWORD_ANSWER, dwHandle, sizeof(BYTE));
 	pkPeer->EncodeBYTE(1);
@@ -1350,13 +1438,13 @@ void CClientManager::QUERY_ITEM_SAVE(CPeer * pkPeer, const char * c_pData)
 
 		snprintf(szQuery, sizeof(szQuery),
 				 "REPLACE INTO item%s (id, owner_id, window, pos, count, vnum, socket0, socket1, socket2, "
-			"attrtype0, attrvalue0, "
+				 "attr_type_0, attr_value_0, "
-			"attrtype1, attrvalue1, "
+				 "attr_type_1, attr_value_1, "
-			"attrtype2, attrvalue2, "
+				 "attr_type_2, attr_value_2, "
-			"attrtype3, attrvalue3, "
+				 "attr_type_3, attr_value_3, "
-			"attrtype4, attrvalue4, "
+				 "attr_type_4, attr_value_4, "
-			"attrtype5, attrvalue5, "
+				 "attr_type_5, attr_value_5, "
-			"attrtype6, attrvalue6) "
+				 "attr_type_6, attr_value_6) "
 				 "VALUES(%u, %u, %d, %d, %u, %u, %d, %d, %d, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd, %hd)",
 				 GetTablePostfix(),
 				 p->id,
@@ -2045,15 +2133,13 @@ void CClientManager::MyshopPricelistRequest(CPeer* peer, DWORD dwHandle, DWORD d
 		TPacketMyshopPricelistHeader header =
 			{
 				pTable->dwOwnerID,
-			pTable->byCount
+				pTable->byCount};
-		};
 
 		size_t sizePriceListSize = sizeof(TItemPriceInfo) * pTable->byCount;
 
 		peer->EncodeHeader(HEADER_DG_MYSHOP_PRICELIST_RES, dwHandle, sizeof(header) + sizePriceListSize);
 		peer->Encode(&header, sizeof(header));
 		peer->Encode(pTable->aPriceInfo, sizePriceListSize);
-
 	}
 	else
 	{
@@ -2475,7 +2561,8 @@ CPeer * CClientManager::AddPeer(bufferevent* bufev, sockaddr* addr)
 {
 	auto *pPeer = new CPeer;
 
-	if (!pPeer->Accept(bufev, addr)) {
+	if (!pPeer->Accept(bufev, addr))
+	{
 		delete pPeer;
 		return nullptr;
 	}
@@ -2773,7 +2860,6 @@ int CClientManager::Process()
 
 			m_iCacheFlushCount = 0;
 
-
 			// 플레이어 플러쉬
 			UpdatePlayerCache();
 			// 아이템 플러쉬
@@ -3544,7 +3630,6 @@ void CClientManager::Election(CPeer * peer, DWORD dwHandle, const char* data)
 		peer->Encode(&Success, sizeof(int));
 		return;
 	}
-
 }
 void CClientManager::Candidacy(CPeer *peer, DWORD dwHandle, const char *data)
 {
@@ -3623,7 +3708,6 @@ void CClientManager::AddMonarchMoney(CPeer * peer, DWORD dwHandle, const char *
 			p->Encode(&Empire, sizeof(int));
 			p->Encode(&Money, sizeof(int));
 		}
-
 	}
 }
 void CClientManager::DecMonarchMoney(CPeer *peer, DWORD dwHandle, const char *data)
@@ -3673,6 +3757,7 @@ void CClientManager::TakeMonarchMoney(CPeer * peer, DWORD dwHandle, const char *
 
 	SPDLOG_TRACE("[MONARCH] Take money Empire({}) Money({})", Empire, Money);
 
+	// TODO The if seems redundant no reason to be so
 	if (CMonarch::instance().TakeMoney(Empire, pid, Money) == true)
 	{
 		peer->EncodeHeader(HEADER_DG_TAKE_MONARCH_MONEY, dwHandle, sizeof(int) + sizeof(int));
@@ -3909,16 +3994,17 @@ void CClientManager::DeleteAwardId(TPacketDeleteAwardID *data)
 	{
 		SPDLOG_DEBUG("DELETE_AWARDID : could not find the id: {}", data->dwID);
 	}
-
 }
 
 void CClientManager::UpdateChannelStatus(TChannelStatus *pData)
 {
 	TChannelStatusMap::iterator it = m_mChannelStatus.find(pData->nPort);
-	if (it != m_mChannelStatus.end()) {
+	if (it != m_mChannelStatus.end())
+	{
 		it->second = pData->bStatus;
 	}
-	else {
+	else
+	{
 		m_mChannelStatus.insert(TChannelStatusMap::value_type(pData->nPort, pData->bStatus));
 	}
 }
@@ -3928,7 +4014,8 @@ void CClientManager::RequestChannelStatus(CPeer* peer, DWORD dwHandle)
 	const int nSize = m_mChannelStatus.size();
 	peer->EncodeHeader(HEADER_DG_RESPOND_CHANNELSTATUS, dwHandle, sizeof(TChannelStatus) * nSize + sizeof(int));
 	peer->Encode(&nSize, sizeof(int));
-	for (TChannelStatusMap::iterator it = m_mChannelStatus.begin(); it != m_mChannelStatus.end(); it++) {
+	for (TChannelStatusMap::iterator it = m_mChannelStatus.begin(); it != m_mChannelStatus.end(); it++)
+	{
 		peer->Encode(&it->first, sizeof(short));
 		peer->Encode(&it->second, sizeof(BYTE));
 	}

src/db/src/ClientManager.h

@@ -76,7 +76,7 @@ class CClientManager : public singleton<CClientManager>
 			pAccountTable = NULL;
 			player_id = dwPID;
 		};
-		//독일선물기능용 생성자
+		// Constructor for the German gift feature
 		ClientHandleInfo(DWORD argHandle, DWORD dwPID, DWORD accountId)
 		{
 			dwHandle = argHandle;
@@ -150,12 +150,10 @@ class CClientManager : public singleton<CClientManager>
 	 */
 	void PutItemPriceListCache(const TItemPriceListTable *pItemPriceList);
 
-
 	/// Flush 시간이 만료된 아이템 가격정보 리스트 캐시를 Flush 해주고 캐시에서 삭제한다.
 	void UpdateItemPriceListCache(void);
 	// END_OF_MYSHOP_PRICE_LIST
 
-
 	void SendGuildSkillUsable(DWORD guild_id, DWORD dwSkillVnum, bool bUsable);
 
 	void SetCacheFlushCountLimit(int iLimit);
@@ -249,10 +247,10 @@ class CClientManager : public singleton<CClientManager>
 
 	void QUERY_PLAYER_LOAD(CPeer *peer, DWORD dwHandle, TPlayerLoadPacket *);
 	void RESULT_COMPOSITE_PLAYER(CPeer *peer, SQLMsg *pMsg, DWORD dwQID);
-	void		RESULT_PLAYER_LOAD(CPeer * peer, MYSQL_RES * pRes, ClientHandleInfo * pkInfo);
+	void RESULT_PLAYER_LOAD(CPeer *peer, pqxx::result *pRes, ClientHandleInfo *pkInfo);
-	void		RESULT_ITEM_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwHandle, DWORD dwPID);
+	void RESULT_ITEM_LOAD(CPeer *peer, pqxx::result *pRes, DWORD dwHandle, DWORD dwPID);
-	void		RESULT_QUEST_LOAD(CPeer * pkPeer, MYSQL_RES * pRes, DWORD dwHandle, DWORD dwPID);
+	void RESULT_QUEST_LOAD(CPeer *pkPeer, pqxx::result *pRes, DWORD dwHandle, DWORD dwPID);
-	void		RESULT_AFFECT_LOAD(CPeer * pkPeer, MYSQL_RES * pRes, DWORD dwHandle);
+	void RESULT_AFFECT_LOAD(CPeer *pkPeer, pqxx::result *pRes, DWORD dwHandle);
 
 	// PLAYER_INDEX_CREATE_BUG_FIX
 	void RESULT_PLAYER_INDEX_CREATE(CPeer *pkPeer, SQLMsg *msg);
@@ -289,7 +287,6 @@ class CClientManager : public singleton<CClientManager>
 	void QUERY_ITEM_DESTROY(CPeer *pkPeer, const char *c_pData);
 	void QUERY_ITEM_FLUSH(CPeer *pkPeer, const char *c_pData);
 
-
 	void QUERY_QUEST_SAVE(CPeer *pkPeer, TQuestTable *, DWORD dwLen);
 	void QUERY_ADD_AFFECT(CPeer *pkPeer, TPacketGDAddAffect *p);
 	void QUERY_REMOVE_AFFECT(CPeer *pkPeer, TPacketGDRemoveAffect *p);
@@ -299,10 +296,10 @@ class CClientManager : public singleton<CClientManager>
 	void QUERY_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangeSizePacket *p);
 	void QUERY_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangePasswordPacket *p);
 
-	void		RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg);
+	void RESULT_SAFEBOX_LOAD(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg);
-	void		RESULT_SAFEBOX_CHANGE_SIZE(CPeer * pkPeer, SQLMsg * msg);
+	void RESULT_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg);
-	void		RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer * pkPeer, SQLMsg * msg);
+	void RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg);
-	void		RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer * pkPeer, SQLMsg * msg);
+	void RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer *pkPeer, ClientHandleInfo *pi, pqxx::result msg);
 
 	void QUERY_EMPIRE_SELECT(CPeer *pkPeer, DWORD dwHandle, TEmpireSelectPacket *p);
 	void QUERY_SETUP(CPeer *pkPeer, DWORD dwHandle, const char *c_pData);
@@ -321,7 +318,7 @@ class CClientManager : public singleton<CClientManager>
 	void QUERY_RELOAD_PROTO();
 
 	void QUERY_CHANGE_NAME(CPeer *peer, DWORD dwHandle, TPacketGDChangeName *p);
-	void		GetPlayerFromRes(TPlayerTable * player_table, MYSQL_RES* res);
+	void GetPlayerFromRes(TPlayerTable *player_table, pqxx::result *res);
 
 	void QUERY_LOGIN_KEY(CPeer *pkPeer, TPacketGDLoginKey *p);
 
@@ -486,7 +483,6 @@ class CClientManager : public singleton<CClientManager>
 	bool __GetHostInfo(std::vector<std::string> &rIPVec);
 	// END_ADMIN_MANAGER
 
-		
 	// RELOAD_ADMIN
 	void ReloadAdmin(CPeer *peer, TPacketReloadAdmin *p);
 	// END_RELOAD_ADMIN
@@ -523,7 +519,6 @@ class CClientManager : public singleton<CClientManager>
 	void SetMonarch(CPeer *peer, DWORD dwHandle, const char *p);
 	void RMMonarch(CPeer *peer, DWORD dwHandle, const char *p);
 
-
 	void DecMonarchMoney(CPeer *peer, DWORD dwHandle, const char *p);
 	// END_MONARCH
 

src/db/src/ClientManagerBoot.cpp

@@ -97,7 +97,6 @@ bool CClientManager::InitializeTables()
 		return false;
 	}
 
-
 	return true;
 }
 
@@ -193,7 +192,6 @@ bool CClientManager::InitializeMobTable()
 	//	5) (최종) 게임 클라이언트에서 제대로 작동 하는지.
 	//_______________________________________________//
 
-
 	//===============================================//
 	//	1) 'mob_names.txt' 파일을 읽어서 (a)[localMap] 맵을 만든다.
 	//<(a)localMap 맵 생성>
@@ -205,15 +203,17 @@ bool CClientManager::InitializeMobTable()
 	{
 		SPDLOG_ERROR("mob_names.txt Failed to read the file");
 		isNameFile = false;
-	} else {
+	}
+	else
+	{
 		nameData.Next(); // 설명row 생략.
-		while(nameData.Next()) {
+		while (nameData.Next())
+		{
 			localMap[atoi(nameData.AsStringByIndex(0))] = nameData.AsStringByIndex(1);
 		}
 	}
 	//________________________________________________//
 
-	
 	//===============================================//
 	//	2) 'mob_proto_test.txt'파일과 (a)localMap 맵으로
 	//		(b)[test_map_mobTableByVnum](vnum:TMobTable) 맵을 생성한다.
@@ -229,7 +229,8 @@ bool CClientManager::InitializeMobTable()
 	}
 	// 2. (c)[test_map_mobTableByVnum](vnum:TMobTable) 맵 생성.
 	map<DWORD, TMobTable *> test_map_mobTableByVnum;
-	if (isTestFile) {
+	if (isTestFile)
+	{
 		test_data.Next(); // 설명 로우 넘어가기.
 
 		// ㄱ. 테스트 몬스터 테이블 생성.
@@ -239,7 +240,8 @@ bool CClientManager::InitializeMobTable()
 		memset(test_mob_table, 0, sizeof(TMobTable) * test_MobTableSize);
 
 		// ㄴ. 테스트 몬스터 테이블에 값을 넣고, 맵에까지 넣기.
-		while(test_data.Next()) {
+		while (test_data.Next())
+		{
 
 			if (!Set_Proto_Mob_Table(test_mob_table, test_data, localMap))
 			{
@@ -248,10 +250,8 @@ bool CClientManager::InitializeMobTable()
 
 			test_map_mobTableByVnum.insert(std::map<DWORD, TMobTable *>::value_type(test_mob_table->dwVnum, test_mob_table));
 
-			
 			++test_mob_table;
 		}
-
 	}
 
 	//	3) 'mob_proto.txt' 파일과  (a)[localMap] 맵으로
@@ -263,7 +263,8 @@ bool CClientManager::InitializeMobTable()
 
 	// 1. 파일 읽기.
 	cCsvTable data;
-	if(!data.Load("mob_proto.txt",'\t')) {
+	if (!data.Load("mob_proto.txt", '\t'))
+	{
 		SPDLOG_ERROR("mob_proto.txt Failed to read the file");
 		return false;
 	}
@@ -271,11 +272,13 @@ bool CClientManager::InitializeMobTable()
 	// 2. (!)[mob_table] 생성하기
 	// 2.1 새로 추가되는 갯수를 파악
 	int addNumber = 0;
-	while(data.Next()) {
+	while (data.Next())
+	{
 		int vnum = atoi(data.AsStringByIndex(0));
 		std::map<DWORD, TMobTable *>::iterator it_map_mobTable;
 		it_map_mobTable = test_map_mobTableByVnum.find(vnum);
-		if(it_map_mobTable != test_map_mobTableByVnum.end()) {
+		if (it_map_mobTable != test_map_mobTableByVnum.end())
+		{
 			addNumber++;
 		}
 	}
@@ -304,11 +307,13 @@ bool CClientManager::InitializeMobTable()
 		bool isSameRow = true;
 		std::map<DWORD, TMobTable *>::iterator it_map_mobTable;
 		it_map_mobTable = test_map_mobTableByVnum.find(atoi(data.AsStringByIndex(col)));
-		if(it_map_mobTable == test_map_mobTableByVnum.end()) {
+		if (it_map_mobTable == test_map_mobTableByVnum.end())
+		{
 			isSameRow = false;
 		}
 		// 같은 row 가 있으면 (b)에서 읽어온다.
-		if(isSameRow) {
+		if (isSameRow)
+		{
 			TMobTable *tempTable = it_map_mobTable->second;
 
 			mob_table->dwVnum = tempTable->dwVnum;
@@ -357,7 +362,6 @@ bool CClientManager::InitializeMobTable()
 			mob_table->dwDrainSP = tempTable->dwDrainSP;
 			mob_table->dwPolymorphItemVnum = tempTable->dwPolymorphItemVnum;
 
-			
 			mob_table->Skills[0].bLevel = tempTable->Skills[0].bLevel;
 			mob_table->Skills[0].dwVnum = tempTable->Skills[0].dwVnum;
 			mob_table->Skills[1].bLevel = tempTable->Skills[1].bLevel;
@@ -374,27 +378,24 @@ bool CClientManager::InitializeMobTable()
 			mob_table->bGodSpeedPoint = tempTable->bGodSpeedPoint;
 			mob_table->bDeathBlowPoint = tempTable->bDeathBlowPoint;
 			mob_table->bRevivePoint = tempTable->bRevivePoint;
-		} else {
+		}
+		else
+		{
 
 			if (!Set_Proto_Mob_Table(mob_table, data, localMap))
 			{
 				SPDLOG_ERROR("Mob proto table setup failed.");
 			}
-
-						
 		}
 
 		// 셋에 vnum 추가
 		vnumSet.insert(mob_table->dwVnum);
 
-
 		SPDLOG_TRACE("MOB #{:<5} {:24} {:24} level: {:<3} rank: {} empire: {}", mob_table->dwVnum, mob_table->szName, mob_table->szLocaleName, mob_table->bLevel, mob_table->bRank, mob_table->bEmpire);
 		++mob_table;
-
 	}
 	//_____________________________________________________//
 
-
 	//	4) (b)[test_map_mobTableByVnum]의 row중, (!)[mob_table]에 없는 것을 추가한다.
 	// 파일 다시 읽어오기.
 	test_data.Destroy();
@@ -405,7 +406,8 @@ bool CClientManager::InitializeMobTable()
 		SPDLOG_ERROR("No test file exists, proceed as is.");
 		isTestFile = false;
 	}
-	if(isTestFile) {
+	if (isTestFile)
+	{
 		test_data.Next(); // 설명 로우 넘어가기.
 
 		while (test_data.Next()) // 테스트 데이터 각각을 훑어나가며,새로운 것을 추가한다.
@@ -413,7 +415,8 @@ bool CClientManager::InitializeMobTable()
 			// 중복되는 부분이면 넘어간다.
 			set<int>::iterator itVnum;
 			itVnum = vnumSet.find(atoi(test_data.AsStringByIndex(0)));
-			if (itVnum != vnumSet.end()) {
+			if (itVnum != vnumSet.end())
+			{
 				continue;
 			}
 
@@ -424,7 +427,6 @@ bool CClientManager::InitializeMobTable()
 
 			SPDLOG_DEBUG("MOB #{:<5} {:24} {:24} level: {:<3} rank: {} empire: {}", mob_table->dwVnum, mob_table->szName, mob_table->szLocaleName, mob_table->bLevel, mob_table->bRank, mob_table->bEmpire);
 			++mob_table;
-
 		}
 	}
 	sort(m_vec_mobTable.begin(), m_vec_mobTable.end(), FCompareVnum());
@@ -595,8 +597,6 @@ bool CClientManager::InitializeItemTable()
 	//     5) (Final) Verify that it works correctly in the game client.
 	//_______________________________________________//
 
-
-
 	//=================================================================================//
 	// 1) Read the 'item_names.txt' file to create (a) [localMap] (vnum:name) map.
 	//=================================================================================//
@@ -607,9 +607,12 @@ bool CClientManager::InitializeItemTable()
 	{
 		SPDLOG_ERROR("item_names.txt Failed to read the file");
 		isNameFile = false;
-	} else {
+	}
+	else
+	{
 		nameData.Next();
-		while(nameData.Next()) {
+		while (nameData.Next())
+		{
 			localMap[atoi(nameData.AsStringByIndex(0))] = nameData.AsStringByIndex(1);
 		}
 	}
@@ -626,7 +629,9 @@ bool CClientManager::InitializeItemTable()
 	{
 		SPDLOG_ERROR("item_proto_test.txt Failed to read the file");
 		// return false;
-	} else {
+	}
+	else
+	{
 		test_data.Next(); // 설명 로우 넘어가기.
 
 		// 2. Create the test item table.
@@ -636,8 +641,8 @@ bool CClientManager::InitializeItemTable()
 		memset(test_item_table, 0, sizeof(TItemTable) * test_itemTableSize);
 
 		// 3. Insert values into the test item table and populate the map.
-		while(test_data.Next()) {
+		while (test_data.Next())
-
+		{
 
 			if (!Set_Proto_Item_Table(test_item_table, test_data, localMap))
 			{
@@ -646,12 +651,10 @@ bool CClientManager::InitializeItemTable()
 
 			test_map_itemTableByVnum.insert(std::map<DWORD, TItemTable *>::value_type(test_item_table->dwVnum, test_item_table));
 			test_item_table++;
-
 		}
 	}
 	//______________________________________________________________________//
 
-
 	//========================================================================//
 	// 3) Using the 'item_proto.txt' file and the (a) [localMap] map,
 	//    create the (!) [item_table] and <m_map_itemTableByVnum>.
@@ -683,11 +686,13 @@ bool CClientManager::InitializeItemTable()
 	//===== Create item table =====//
 	// Determine the number of newly added items.
 	int addNumber = 0;
-	while(data.Next()) {
+	while (data.Next())
+	{
 		int vnum = atoi(data.AsStringByIndex(0));
 		std::map<DWORD, TItemTable *>::iterator it_map_itemTable;
 		it_map_itemTable = test_map_itemTableByVnum.find(vnum);
-		if(it_map_itemTable != test_map_itemTableByVnum.end()) {
+		if (it_map_itemTable != test_map_itemTableByVnum.end())
+		{
 			addNumber++;
 		}
 	}
@@ -712,17 +717,17 @@ bool CClientManager::InitializeItemTable()
 
 		std::map<DWORD, TItemTable *>::iterator it_map_itemTable;
 		it_map_itemTable = test_map_itemTableByVnum.find(atoi(data.AsStringByIndex(col)));
-		if(it_map_itemTable == test_map_itemTableByVnum.end()) {
+		if (it_map_itemTable == test_map_itemTableByVnum.end())
+		{
 			// Store data for each column
 
 			if (!Set_Proto_Item_Table(item_table, data, localMap))
 			{
 				SPDLOG_ERROR("Item proto table setup failed.");
 			}
-
+		}
-
+		else
-			
+		{ // $$$$$$$$$$$$$$$$$$$$$ There is test item information!
-		} else {	// $$$$$$$$$$$$$$$$$$$$$ There is test item information!
 			TItemTable *tempTable = it_map_itemTable->second;
 
 			item_table->dwVnum = tempTable->dwVnum;
@@ -770,7 +775,6 @@ bool CClientManager::InitializeItemTable()
 			item_table->sAddonType = tempTable->sAddonType;
 
 			item_table->bWeight = tempTable->bWeight;
-
 		}
 		vnumSet.insert(item_table->dwVnum);
 		m_map_itemTableByVnum.insert(std::map<DWORD, TItemTable *>::value_type(item_table->dwVnum, item_table));
@@ -786,7 +790,9 @@ bool CClientManager::InitializeItemTable()
 	{
 		SPDLOG_ERROR("item_proto_test.txt Failed to read the file");
 		// return false;
-	} else {
+	}
+	else
+	{
 		test_data.Next(); // Skip the description row.
 
 		while (test_data.Next()) // Iterate through each test data entry and add new ones.
@@ -794,7 +800,8 @@ bool CClientManager::InitializeItemTable()
 			// Skip if it’s a duplicate.
 			set<int>::iterator itVnum;
 			itVnum = vnumSet.find(atoi(test_data.AsStringByIndex(0)));
-			if (itVnum != vnumSet.end()) {
+			if (itVnum != vnumSet.end())
+			{
 				continue;
 			}
 
@@ -803,16 +810,12 @@ bool CClientManager::InitializeItemTable()
 				SPDLOG_ERROR("Item proto table setup failed.");
 			}
 
-
 			m_map_itemTableByVnum.insert(std::map<DWORD, TItemTable *>::value_type(item_table->dwVnum, item_table));
 
 			item_table++;
-
 		}
 	}
 
-
-
 	// QUEST_ITEM_PROTO_DISABLE
 	// InitializeQuestItemTable();
 	// END_OF_QUEST_ITEM_PROTO_DISABLE
@@ -848,7 +851,6 @@ bool CClientManager::InitializeItemTable()
 	return true;
 }
 
-
 bool CClientManager::InitializeSkillTable()
 {
 	char query[4096];
@@ -1400,8 +1402,7 @@ bool CClientManager::MirrorMobTableIntoDB()
 
 					 t.Skills[0].dwVnum, t.Skills[0].bLevel, t.Skills[1].dwVnum, t.Skills[1].bLevel, t.Skills[2].dwVnum, t.Skills[2].bLevel,
 					 t.Skills[3].dwVnum, t.Skills[3].bLevel, t.Skills[4].dwVnum, t.Skills[4].bLevel,
-				t.bBerserkPoint, t.bStoneSkinPoint, t.bGodSpeedPoint, t.bDeathBlowPoint, t.bRevivePoint
+					 t.bBerserkPoint, t.bStoneSkinPoint, t.bGodSpeedPoint, t.bDeathBlowPoint, t.bRevivePoint);
-				);
 		}
 		else
 		{
@@ -1452,8 +1453,7 @@ bool CClientManager::MirrorMobTableIntoDB()
 
 					 t.Skills[0].dwVnum, t.Skills[0].bLevel, t.Skills[1].dwVnum, t.Skills[1].bLevel, t.Skills[2].dwVnum, t.Skills[2].bLevel,
 					 t.Skills[3].dwVnum, t.Skills[3].bLevel, t.Skills[4].dwVnum, t.Skills[4].bLevel,
-				t.bBerserkPoint, t.bStoneSkinPoint, t.bGodSpeedPoint, t.bDeathBlowPoint, t.bRevivePoint
+					 t.bBerserkPoint, t.bStoneSkinPoint, t.bGodSpeedPoint, t.bDeathBlowPoint, t.bRevivePoint);
-				);
 		}
 
 		CDBManager::instance().AsyncQuery(query);

src/db/src/ClientManagerEventFlag.cpp

@@ -74,4 +74,3 @@ void CClientManager::SendEventFlagsOnSetup(CPeer* peer)
 		peer->Encode(&p, sizeof(TPacketSetEventFlag));
 	}
 }
-

src/db/src/ClientManagerGuild.cpp

@@ -7,7 +7,6 @@
 #include "QID.h"
 #include "GuildManager.h"
 
-
 void CClientManager::GuildCreate(CPeer *peer, DWORD dwGuildID)
 {
 	SPDLOG_DEBUG("GuildCreate {}", dwGuildID);
@@ -241,4 +240,3 @@ void CClientManager::GuildChangeMaster(TPacketChangeGuildMaster* p)
 		ForwardPacket(HEADER_DG_ACK_CHANGE_GUILD_MASTER, &packet, sizeof(packet));
 	}
 }
-

src/db/src/ClientManagerHorseName.cpp

@@ -37,4 +37,3 @@ void CClientManager::AckHorseName(DWORD dwPID, CPeer* peer)
 	peer->EncodeHeader(HEADER_DG_ACK_HORSE_NAME, 0, sizeof(TPacketUpdateHorseName));
 	peer->Encode(&packet, sizeof(TPacketUpdateHorseName));
 }
-

src/db/src/ClientManagerLogin.cpp

@@ -427,7 +427,6 @@ void CClientManager::RESULT_LOGIN(CPeer * peer, SQLMsg * msg)
 			// END_PREVENT_COPY_ITEM
 			peer->EncodeHeader(HEADER_DG_LOGIN_SUCCESS, info->dwHandle, sizeof(TAccountTable));
 			peer->Encode(info->pAccountTable, sizeof(TAccountTable));
-
 		}
 
 		delete info->pAccountTable;
@@ -518,4 +517,3 @@ void CClientManager::QUERY_CHANGE_NAME(CPeer * peer, DWORD dwHandle, TPacketGDCh
 	strlcpy(pdg.name, p->name, sizeof(pdg.name));
 	peer->Encode(&pdg, sizeof(TPacketDGChangeName));
 }
-

src/db/src/ClientManagerPlayer.cpp

@@ -18,7 +18,8 @@ extern int g_test_server;
 //
 // Check all SELECT syntax on item table before change this function!!!
 //
-bool CreateItemTableFromRes(MYSQL_RES * res, std::vector<TPlayerItem> * pVec, DWORD dwPID)
+// TODO Finish moving this to pg
+bool CreateItemTableFromRes(pqxx::result *res, std::vector<TPlayerItem> *pVec, DWORD dwPID)
 {
 	if (!res)
 	{
@@ -112,8 +113,7 @@ size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * p
 						"horse_hp = %d, "
 						"horse_hp_droptime = %u, "
 						"horse_stamina = %d, "
-			"horse_skill_point = %d, "
+						"horse_skill_point = %d, ",
-			,
 						GetTablePostfix(),
 						pkTab->job,
 						pkTab->voice,
@@ -253,7 +253,9 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
 			peer->Encode(&logInfo, sizeof(TPacketNeedLoginLogInfo));
 		}
 
-		char szQuery[1024] = { 0, };
+		char szQuery[1024] = {
+			0,
+		};
 
 		TItemCacheSet *pSet = GetItemCacheSet(pTab->id);
 
@@ -390,8 +392,6 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad
 				 GetTablePostfix(), packet->player_id);
 		CDBManager::instance().ReturnQuery(queryStr, QID_AFFECT, peer->GetHandle(), new ClientHandleInfo(dwHandle, packet->player_id));
 	}
-	
-	
 }
 void CClientManager::ItemAward(CPeer *peer, char *login)
 {
@@ -612,7 +612,6 @@ void CClientManager::RESULT_COMPOSITE_PLAYER(CPeer * peer, SQLMsg * pMsg, DWORD
 		   break;
 		   */
 	}
-	
 }
 
 void CClientManager::RESULT_PLAYER_LOAD(CPeer *peer, MYSQL_RES *pRes, ClientHandleInfo *pkInfo)
@@ -807,7 +806,8 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC
 
 		MYSQL_ROW row = mysql_fetch_row(pMsg0->Get()->pSQLResult);
 
-		DWORD dwPID = 0; str_to_number(dwPID, row[0]);
+		DWORD dwPID = 0;
+		str_to_number(dwPID, row[0]);
 		if (row[0] && dwPID > 0)
 		{
 			peer->EncodeHeader(HEADER_DG_PLAYER_CREATE_ALREADY, dwHandle, 0);
@@ -1262,4 +1262,3 @@ void CClientManager::FlushPlayerCacheSet(DWORD pid)
 		delete c;
 	}
 }
-

src/db/src/Config.cpp

@@ -138,12 +138,10 @@ bool CConfig::LoadFile(const char* filename)
 			GetLine(fp, szTmp);
 			m_valueMap.insert(TValueMap::value_type(comment, szTmp));
 			mode = 0;
-
 		}
 		// ITEM_ID_RANGE_END
 	}
 
-
 	// 파일 닫는 부분.
 	fclose(fp);
 	return true;
@@ -187,7 +185,6 @@ const char * CConfig::Get(const char* key)
 	return pstStr->c_str();
 }
 
-
 bool CConfig::GetValue(const char *key, int *dest)
 {
 	if (!Search(key))
@@ -247,4 +244,3 @@ bool CConfig::GetTwoValue(const char* key, DWORD * dest1, DWORD *dest2)
 
 	return true;
 }
-

src/db/src/CsvReader.cpp

@@ -107,14 +107,17 @@ bool cCsvFile::Load(const char* fileName, const char seperator, const char quote
     Assert(seperator != quote);
 
     std::ifstream file(fileName, std::ios::in);
-    if (!file) return false;
+    if (!file)
+        return false;
 
     Destroy(); // 기존의 데이터를 삭제
 
     cCsvRow *row = NULL;
     ParseState state = STATE_NORMAL;
     std::string token = "";
-    char buf[2048+1] = {0,};
+    char buf[2048 + 1] = {
+        0,
+    };
 
     while (file.good())
     {
@@ -122,7 +125,8 @@ bool cCsvFile::Load(const char* fileName, const char seperator, const char quote
         buf[sizeof(buf) - 1] = 0;
 
         std::string line(Trim(buf));
-        if (line.empty() || (state == STATE_NORMAL && line[0] == '#')) continue;
+        if (line.empty() || (state == STATE_NORMAL && line[0] == '#'))
+            continue;
 
         std::string text = std::string(line) + "  "; // 파싱 lookahead 때문에 붙여준다.
         size_t cur = 0;
@@ -223,11 +227,18 @@ bool cCsvFile::Save(const char* fileName, bool append, char seperator, char quot
 
     // 출력 모드에 따라 파일을 적당한 플래그로 생성한다.
     std::ofstream file;
-    if (append) { file.open(fileName, std::ios::out | std::ios::app); }
+    if (append)
-    else { file.open(fileName, std::ios::out | std::ios::trunc); }
+    {
+        file.open(fileName, std::ios::out | std::ios::app);
+    }
+    else
+    {
+        file.open(fileName, std::ios::out | std::ios::trunc);
+    }
 
     // 파일을 열지 못했다면, false를 리턴한다.
-    if (!file) return false;
+    if (!file)
+        return false;
 
     char special_chars[5] = {seperator, quote, '\r', '\n', 0};
     char quote_escape_string[3] = {quote, quote, 0};
@@ -258,15 +269,20 @@ bool cCsvFile::Save(const char* fileName, bool append, char seperator, char quot
 
                 for (size_t k = 0; k < token.size(); k++)
                 {
-                    if (token[k] == quote) line += quote_escape_string;
+                    if (token[k] == quote)
-                    else line += token[k];
+                        line += quote_escape_string;
+                    else
+                        line += token[k];
                 }
 
                 line += quote;
             }
 
             // 마지막 셀이 아니라면 ','를 토큰의 뒤에다 붙여줘야한다.
-            if (j != row.size() - 1) { line += seperator; }
+            if (j != row.size() - 1)
+            {
+                line += seperator;
+            }
         }
 
         // 라인을 출력한다.
@@ -427,4 +443,3 @@ const cCsvRow* const cCsvTable::CurRow() const
 
     return m_File[m_CurRow];
 }
-

src/db/src/CsvReader.h

@@ -50,7 +50,6 @@ private:
     NAME2INDEX_MAP m_Name2Index; ///< 셀 인덱스 대신으로 사용하기 위한 이름들
     INDEX2NAME_MAP m_Index2Name; ///< 잘못된 alias를 검사하기 위한 추가적인 맵
 
-
 public:
     /// \brief 생성자
     cCsvAlias() {}
@@ -58,7 +57,6 @@ public:
     /// \brief 소멸자
     virtual ~cCsvAlias() {}
 
-
 public:
     /// \brief 셀을 액세스할 때, 숫자 대신 사용할 이름을 등록한다.
     void AddAlias(const char *name, size_t index);
@@ -72,7 +70,6 @@ public:
     /// \brief 이름을 숫자 인덱스로 변환한다.
     size_t operator[](const char *name) const;
 
-
 private:
     /// \brief 복사 생성자 금지
     cCsvAlias(const cCsvAlias &) {}
@@ -81,7 +78,6 @@ private:
     const cCsvAlias &operator=(const cCsvAlias &) { return *this; }
 };
 
-
 ////////////////////////////////////////////////////////////////////////////////
 /// \class cCsvRow
 /// \brief CSV 파일의 한 행을 캡슐화한 클래스
@@ -117,7 +113,6 @@ public:
     /// \brief 소멸자
     ~cCsvRow() {}
 
-
 public:
     /// \brief 해당 셀의 데이터를 int 형으로 반환한다.
     int AsInt(size_t index) const { return atoi(at(index).c_str()); }
@@ -129,21 +124,23 @@ public:
     const char *AsString(size_t index) const { return at(index).c_str(); }
 
     /// \brief 해당하는 이름의 셀 데이터를 int 형으로 반환한다.
-    int AsInt(const char* name, const cCsvAlias& alias) const {
+    int AsInt(const char *name, const cCsvAlias &alias) const
+    {
         return atoi(at(alias[name]).c_str());
     }
 
     /// \brief 해당하는 이름의 셀 데이터를 int 형으로 반환한다.
-    double AsDouble(const char* name, const cCsvAlias& alias) const {
+    double AsDouble(const char *name, const cCsvAlias &alias) const
+    {
         return atof(at(alias[name]).c_str());
     }
 
     /// \brief 해당하는 이름의 셀 데이터를 문자열로 반환한다.
-    const char* AsString(const char* name, const cCsvAlias& alias) const { 
+    const char *AsString(const char *name, const cCsvAlias &alias) const
+    {
         return at(alias[name]).c_str();
     }
 
-
 private:
     /// \brief 복사 생성자 금지
     cCsvRow(const cCsvRow &) {}
@@ -152,7 +149,6 @@ private:
     const cCsvRow &operator=(const cCsvRow &) { return *this; }
 };
 
-
 ////////////////////////////////////////////////////////////////////////////////
 /// \class cCsvFile
 /// \brief CSV(Comma Seperated Values) 파일을 read/write하기 위한 클래스
@@ -190,7 +186,6 @@ private:
 
     ROWS m_Rows; ///< 행 컬렉션
 
-
 public:
     /// \brief 생성자
     cCsvFile() {}
@@ -198,7 +193,6 @@ public:
     /// \brief 소멸자
     virtual ~cCsvFile() { Destroy(); }
 
-
 public:
     /// \brief 지정된 이름의 CSV 파일을 로드한다.
     bool Load(const char *fileName, const char seperator = ',', const char quote = '"');
@@ -218,7 +212,6 @@ public:
     /// \brief 행의 갯수를 반환한다.
     size_t GetRowCount() const { return m_Rows.size(); }
 
-
 private:
     /// \brief 복사 생성자 금지
     cCsvFile(const cCsvFile &) {}
@@ -227,7 +220,6 @@ private:
     const cCsvFile &operator=(const cCsvFile &) { return *this; }
 };
 
-
 ////////////////////////////////////////////////////////////////////////////////
 /// \class cCsvTable
 /// \brief CSV 파일을 이용해 테이블 데이터를 로드하는 경우가 많은데, 이 클래스는
@@ -264,7 +256,6 @@ private:
     cCsvAlias m_Alias; ///< 문자열을 셀 인덱스로 변환하기 위한 객체
     int m_CurRow;      ///< 현재 횡단 중인 행 번호
 
-
 public:
     /// \brief 생성자
     cCsvTable();
@@ -272,7 +263,6 @@ public:
     /// \brief 소멸자
     virtual ~cCsvTable();
 
-
 public:
     /// \brief 지정된 이름의 CSV 파일을 로드한다.
     bool Load(const char *fileName, const char seperator = ',', const char quote = '"');
@@ -307,7 +297,6 @@ public:
     /// \brief alias를 포함해 모든 데이터를 삭제한다.
     void Destroy();
 
-
 private:
     /// \brief 현재 행을 반환한다.
     const cCsvRow *const CurRow() const;

src/db/src/DBManager.cpp

@@ -6,183 +6,206 @@ extern std::string g_stLocale;
 
 CDBManager::CDBManager()
 {
-	Initialize();
+	StartWorkerThread();
 }
 
 CDBManager::~CDBManager()
 {
-	Destroy();
+	Quit();
 }
 
-void CDBManager::Initialize()
+int CDBManager::Connect(const char *db_address, int db_port, const char *db_name, const char *user, const char *pwd)
 {
-	for (int i = 0; i < SQL_MAX_NUM; ++i)
+	if (!db_address || !db_name || !user || !pwd)
+		return false;
+
+	try
 	{
-		m_mainSQL[i] = NULL;
+		m_connPool = std::make_shared<PgConnectionPool>(
-		m_directSQL[i] = NULL;
+			db_address, db_port, db_name, user, pwd,
-		m_asyncSQL[i] = NULL;
+			10, // poolSize
+			60	// idleTimeoutSeconds
+		);
+
+		// Optionally, do a test connection:
+		{
+			auto conn = m_connPool->acquire();
+			if (!conn || !conn->is_open())
+			{
+				SPDLOG_ERROR("Failed to open test connection to DB");
+				m_connPool.reset();
+				return false;
 			}
 		}
 
-void CDBManager::Destroy()
+		SPDLOG_INFO("Connected to PostgreSQL at {}:{}, DB: {}", db_address, db_port, db_name);
+		return true;
+	}
+	catch (const std::exception &ex)
 	{
-	Clear();
+		SPDLOG_ERROR("Exception while connecting to DB: {}", ex.what());
+		return false;
+	}
 }
 
 void CDBManager::Clear()
 {
-	for (int i = 0; i < SQL_MAX_NUM; ++i)
+	std::lock_guard<std::mutex> lock(m_queueMutex);
-	{
+	std::queue<std::shared_ptr<PgAsyncQuery>> empty;
-		if (m_mainSQL[i])
+	m_queryQueue.swap(empty);
-		{
-			delete m_mainSQL[i];
-			m_mainSQL[i] = NULL;
-		}
-
-		if (m_directSQL[i])
-		{
-			delete m_directSQL[i];
-			m_directSQL[i] = NULL;
-		}
-
-		if (m_asyncSQL[i])
-		{
-			delete m_asyncSQL[i];
-			m_asyncSQL[i] = NULL;
-		}
-	}
-
-	Initialize();
 }
 
 void CDBManager::Quit()
 {
-	for (int i = 0; i < SQL_MAX_NUM; ++i)
+	if (m_quit.exchange(1) == 0)
 	{
-		if (m_mainSQL[i])
+		StopWorkerThread();
-			m_mainSQL[i]->Quit();
+		if (m_connPool)
-
-		if (m_asyncSQL[i])
-			m_asyncSQL[i]->Quit();
-
-		if (m_directSQL[i])
-			m_directSQL[i]->Quit();
-	}
-}
-
-SQLMsg * CDBManager::PopResult()
 		{
-	SQLMsg * p;
+			m_connPool.reset();
-
+		}
-	for (int i = 0; i < SQL_MAX_NUM; ++i)
+	}
-		if (m_mainSQL[i] && m_mainSQL[i]->PopResult(&p))
-			return p;
-
-	return NULL;
 }
 
-SQLMsg * CDBManager::PopResult(eSQL_SLOT slot)
+std::shared_ptr<PgConnectionPool> CDBManager::GetConnectionPool()
 {
-	SQLMsg * p;
+	return m_connPool;
-
-	if (m_mainSQL[slot] && m_mainSQL[slot]->PopResult(&p))
-			return p;
-
-	return NULL;
 }
-int CDBManager::Connect(int iSlot, const char * db_address, const int db_port, const char * db_name, const char * user, const char * pwd)
+
+void CDBManager::AsyncQuery(const std::string &query, const pqxx::params &params)
 {
-	if (db_address == NULL || db_name == NULL)
+	auto msg = std::make_shared<PgAsyncQuery>(++m_msgCounter, query, params);
-		return false;
 
-	if (iSlot < 0 || iSlot >= SQL_MAX_NUM)
-		return false;
-
-	SPDLOG_INFO("CREATING DIRECT_SQL");
-	m_directSQL[iSlot] = new CAsyncSQL2;
-	if (!m_directSQL[iSlot]->Setup(db_address, user, pwd, db_name, g_stLocale.c_str(), true, db_port))
 	{
-		Clear();
+		std::lock_guard<std::mutex> lock(m_queueMutex);
-		return false;
+		m_queryQueue.push(msg);
 	}
 
+	m_queueCondition.notify_one();
+}
 
-    SPDLOG_INFO("CREATING MAIN_SQL");
+void CDBManager::AsyncQuery(const std::string &query, const pqxx::params &params, AsyncQueryCallback callback)
-	m_mainSQL[iSlot] = new CAsyncSQL2;
-	if (!m_mainSQL[iSlot]->Setup(db_address, user, pwd, db_name, g_stLocale.c_str(), false, db_port))
 {
-		Clear();
+	auto msg = std::make_shared<PgAsyncQuery>(++m_msgCounter, query, params, std::move(callback));
-		return false;
-	}
 
-    SPDLOG_INFO("CREATING ASYNC_SQL");
-	m_asyncSQL[iSlot] = new CAsyncSQL2;
-	if (!m_asyncSQL[iSlot]->Setup(db_address, user, pwd, db_name, g_stLocale.c_str(), false, db_port))
 	{
-		Clear();
+		std::lock_guard<std::mutex> lock(m_queueMutex);
-		return false;
+		m_queryQueue.push(msg);
 	}
 
-	return true;
+	m_queueCondition.notify_one();
 }
 
-SQLMsg * CDBManager::DirectQuery(const char * c_pszQuery, int iSlot)
+size_t CDBManager::GetPendingQueryCount() const
 {
-	return m_directSQL[iSlot]->DirectQuery(c_pszQuery);
+	std::lock_guard<std::mutex> lock(m_queueMutex);
+	return m_queryQueue.size();
 }
 
-extern CPacketInfo g_query_info;
+size_t CDBManager::GetCompletedQueryCount() const
-extern int g_query_count[2];
-
-void CDBManager::ReturnQuery(const char * c_pszQuery, int iType, IDENT dwIdent, void * udata, int iSlot)
 {
-	assert(iSlot < SQL_MAX_NUM);
+	return m_completedQueries.load();
-	//SPDLOG_DEBUG("ReturnQuery {}", c_pszQuery);
-	CQueryInfo * p = new CQueryInfo;
-
-	p->iType = iType;
-	p->dwIdent = dwIdent;
-	p->pvData = udata;
-
-	m_mainSQL[iSlot]->ReturnQuery(c_pszQuery, p);
-
-	//g_query_info.Add(iType);
-	++g_query_count[0];
 }
 
-void CDBManager::AsyncQuery(const char * c_pszQuery, int iSlot)
+void CDBManager::ResetQueryStats()
 {
-	assert(iSlot < SQL_MAX_NUM);
+	m_completedQueries = 0;
-	m_asyncSQL[iSlot]->AsyncQuery(c_pszQuery);
-	++g_query_count[1];
 }
 
-unsigned int CDBManager::EscapeString(void *to, const void *from, unsigned int length, int iSlot)
+void CDBManager::StartWorkerThread()
 {
-	assert(iSlot < SQL_MAX_NUM);
+	if (!m_workerRunning.exchange(true))
-	return mysql_real_escape_string(m_directSQL[iSlot]->GetSQLHandle(), (char *) to, (const char *) from, length);
-}
-
-void CDBManager::SetLocale(const char * szLocale)
 	{
-	const std::string stLocale(szLocale);
+		m_workerThread = std::thread(&CDBManager::WorkerLoop, this);
-	SPDLOG_DEBUG("SetLocale start");
-	for (int n = 0; n < SQL_MAX_NUM; ++n)
-	{
-		m_mainSQL[n]->SetLocale(stLocale);
-		m_directSQL[n]->SetLocale(stLocale);
-		m_asyncSQL[n]->SetLocale(stLocale);
-	}
-	SPDLOG_DEBUG("End setlocale {}", szLocale);
-}
-
-void CDBManager::QueryLocaleSet()
-{
-	for (int n = 0; n < SQL_MAX_NUM; ++n)
-	{
-		m_mainSQL[n]->QueryLocaleSet();
-		m_directSQL[n]->QueryLocaleSet();
-		m_asyncSQL[n]->QueryLocaleSet();
 	}
 }
 
+void CDBManager::StopWorkerThread()
+{
+	if (m_workerRunning.exchange(false))
+	{
+		m_queueCondition.notify_all();
+		if (m_workerThread.joinable())
+		{
+			m_workerThread.join();
+		}
+	}
+}
+
+void CDBManager::WorkerLoop()
+{
+	SPDLOG_INFO("AsyncQuery worker thread started");
+
+	while (m_workerRunning)
+	{
+		std::shared_ptr<PgAsyncQuery> msg;
+
+		{
+			std::unique_lock<std::mutex> lock(m_queueMutex);
+			m_queueCondition.wait(lock, [this]
+								  { return !m_queryQueue.empty() || !m_workerRunning; });
+
+			if (!m_workerRunning && m_queryQueue.empty())
+			{
+				break;
+			}
+
+			if (!m_queryQueue.empty())
+			{
+				msg = m_queryQueue.front();
+				m_queryQueue.pop();
+			}
+		}
+
+		if (msg)
+		{
+			ProcessQuery(msg);
+		}
+	}
+
+	SPDLOG_INFO("AsyncQuery worker thread stopped");
+}
+
+void CDBManager::ProcessQuery(std::shared_ptr<PgAsyncQuery> msg)
+{
+	pqxx::result result;
+	std::string error;
+
+	try
+	{
+		if (!m_connPool)
+		{
+			throw std::runtime_error("No database connection available");
+		}
+
+		auto conn = m_connPool->acquire();
+		if (!conn)
+		{
+			throw std::runtime_error("Failed to get connection from pool");
+		}
+
+		pqxx::work txn(*conn);
+		result = txn.exec_params(msg->query, msg->parameters);
+		txn.commit();
+
+		SPDLOG_TRACE("AsyncQuery completed: {} (ID: {})", msg->query, msg->id);
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("AsyncQuery failed: {} (query: {}, ID: {})", e.what(), msg->query, msg->id);
+	}
+
+	if (msg->hasCallback && msg->callback)
+	{
+		try
+		{
+			msg->callback(result, error);
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("AsyncQuery callback threw exception: {}", e.what());
+		}
+	}
+
+	++m_completedQueries;
+}

src/db/src/DBManager.h

@@ -1,97 +1,49 @@
-// vim:ts=8 sw=4
 #ifndef __INC_METIN2_DB_DBMANAGER_H__
 #define __INC_METIN2_DB_DBMANAGER_H__
 
-// 디비 커넥션 클래스의 목적은...  디비에 접속해서 쿼리보내고 결과 받아오는
+#include <libsql/include/PgConnectionPool.h>
-// 모든 일들을 처리한다.
+#include <libsql/include/PgAsyncQuery.h>
-//                             코드 by 꼬붕 후로그래머 아노아~ = _=)b
+#include <memory>
-#include <libsql/include/CAsyncSQL.h>
-
-#define SQL_SAFE_LENGTH(size)	(size * 2 + 1)
-#define QUERY_SAFE_LENGTH(size)	(1024 + SQL_SAFE_LENGTH(size))
-
-class CQueryInfo
-{
-    public:
-	int	iType;
-	DWORD	dwIdent;
-	void *	pvData;
-};
-
-enum eSQL_SLOT
-{
-    SQL_PLAYER,
-    SQL_ACCOUNT,
-	SQL_COMMON,
-    SQL_MAX_NUM,
-};
 
 class CDBManager : public singleton<CDBManager>
 {
-    protected:
-	void			Initialize();
-	void			Destroy();
-
 public:
 	CDBManager();
 	virtual ~CDBManager();
 
+	int Connect(const char *host, int port, const char *dbname, const char *user, const char *pass);
 	void Clear();
 	void Quit();
 
-	int			Connect(int iSlot, const char * host, int port, const char* dbname, const char* user, const char* pass);
+	std::shared_ptr<PgConnectionPool> GetConnectionPool();
 
-	void			ReturnQuery(const char * c_pszQuery, int iType, DWORD dwIdent, void * pvData, int iSlot = SQL_PLAYER);
+	// Async Query
-	void			AsyncQuery(const char * c_pszQuery, int iSlot = SQL_PLAYER);
-	SQLMsg *		DirectQuery(const char * c_pszQuery, int iSlot = SQL_PLAYER);
 
-	SQLMsg *		PopResult();
+	void AsyncQuery(const std::string &query, const pqxx::params &params = pqxx::params{});
-	SQLMsg * 		PopResult(eSQL_SLOT slot );
+	void AsyncQuery(const std::string &query, const pqxx::params &params, AsyncQueryCallback callback);
 
-	unsigned int		EscapeString(void * to, const void * from, unsigned int length, int iSlot = SQL_PLAYER);
+	size_t GetPendingQueryCount() const;
-
+	size_t GetCompletedQueryCount() const;
-	DWORD			CountReturnQuery(int i) { return m_mainSQL[i] ? m_mainSQL[i]->CountQuery() : 0; }
+	void ResetQueryStats();
-	DWORD			CountReturnResult(int i) { return m_mainSQL[i] ? m_mainSQL[i]->CountResult() : 0; }
-	DWORD			CountReturnQueryFinished(int i) { return m_mainSQL[i] ? m_mainSQL[i]->CountQueryFinished() : 0; }
-	DWORD			CountReturnCopiedQuery(int i) { return m_mainSQL[i] ? m_mainSQL[i]->GetCopiedQueryCount() : 0; }
-
-	DWORD			CountAsyncQuery(int i) { return m_asyncSQL[i] ? m_asyncSQL[i]->CountQuery() : 0; }
-	DWORD			CountAsyncResult(int i) { return m_asyncSQL[i] ? m_asyncSQL[i]->CountResult() : 0; }
-	DWORD			CountAsyncQueryFinished(int i) { return m_asyncSQL[i] ? m_asyncSQL[i]->CountQueryFinished() : 0; }
-	DWORD			CountAsyncCopiedQuery(int i) { return m_asyncSQL[i] ? m_asyncSQL[i]->GetCopiedQueryCount() : 0; }
-
-	void			ResetCounter()
-	{
-	    for (int i = 0; i < SQL_MAX_NUM; ++i)
-		{
-			if (m_mainSQL[i])
-			{
-				m_mainSQL[i]->ResetQueryFinished();
-				m_mainSQL[i]->ResetCopiedQueryCount();
-			}
-
-			if (m_asyncSQL[i])
-			{
-				m_asyncSQL[i]->ResetQueryFinished();
-				m_asyncSQL[i]->ResetCopiedQueryCount();
-			}
-		}
-	}
 
 private:
-	CAsyncSQL2 *		m_mainSQL[SQL_MAX_NUM];
+	std::shared_ptr<PgConnectionPool> m_connPool;
-	CAsyncSQL2 *	 	m_directSQL[SQL_MAX_NUM];
+	std::atomic<int> m_quit{0};
-	CAsyncSQL2 *		m_asyncSQL[SQL_MAX_NUM];
 
-	int			m_quit;		// looping flag
+	// Async Query
 
-	//CHARSET
+	void StartWorkerThread();
-	public:
+	void StopWorkerThread();
-	void SetLocale(const char * szLocale );
+	void WorkerLoop();
-	void QueryLocaleSet();
+	void ProcessQuery(std::shared_ptr<PgAsyncQuery> msg);
-	private:
 
-	//END_CHARSET
+	std::queue<std::shared_ptr<PgAsyncQuery>> m_queryQueue;
+	mutable std::mutex m_queueMutex;
+	std::condition_variable m_queueCondition;
+	std::thread m_workerThread;
+	std::atomic<int> m_msgCounter{0};
+	std::atomic<size_t> m_completedQueries{0};
+	std::atomic<bool> m_workerRunning{false};
 };
 
 #endif

src/db/src/GuildManager.cpp

@@ -14,15 +14,24 @@ bool isEurope()
 {
 	do
 	{
-		if (g_stLocale.compare("germany") == 0) break;
+		if (g_stLocale.compare("germany") == 0)
-		if (g_stLocale.compare("france") == 0) break;
+			break;
-		if (g_stLocale.compare("italy") == 0) break;
+		if (g_stLocale.compare("france") == 0)
-		if (g_stLocale.compare("spain") == 0) break;
+			break;
-		if (g_stLocale.compare("uk") == 0) break;
+		if (g_stLocale.compare("italy") == 0)
-		if (g_stLocale.compare("turkey") == 0) break;
+			break;
-		if (g_stLocale.compare("poland") == 0) break;
+		if (g_stLocale.compare("spain") == 0)
-		if (g_stLocale.compare("portugal") == 0) break;
+			break;
-		if (g_stLocale.compare("greek") == 0) break;
+		if (g_stLocale.compare("uk") == 0)
+			break;
+		if (g_stLocale.compare("turkey") == 0)
+			break;
+		if (g_stLocale.compare("poland") == 0)
+			break;
+		if (g_stLocale.compare("portugal") == 0)
+			break;
+		if (g_stLocale.compare("greek") == 0)
+			break;
 
 		return false;
 	} while (false);
@@ -35,8 +44,10 @@ DWORD GetGuildWarWaitStartDuration()
 	// const int GUILD_WAR_WAIT_START_DURATION = 60;
 	// const int GUILD_WAR_WAIT_START_DURATION = 5;
 
-	if (isEurope() == true) return 60;
+	if (isEurope() == true)
-	else return 5;
+		return 60;
+	else
+		return 5;
 }
 
 DWORD GetGuildWarReserveSeconds()
@@ -44,8 +55,10 @@ DWORD GetGuildWarReserveSeconds()
 	// const int GUILD_WAR_RESERVE_SECONDS = 180;
 	// const int GUILD_WAR_RESERVE_SECONDS = 10;
 
-	if (isEurope() == true) return 180;
+	if (isEurope() == true)
-	else return 10;
+		return 180;
+	else
+		return 10;
 }
 
 namespace
@@ -127,23 +140,21 @@ TGuild & CGuildManager::TouchGuild(DWORD GID)
 	return m_map_kGuild[GID];
 }
 
-void CGuildManager::ParseResult(SQLResult * pRes)
+void CGuildManager::ParseResult(pqxx::result result)
 {
-	MYSQL_ROW row;
+	for (auto row : result)
-
-	while ((row = mysql_fetch_row(pRes->pSQLResult)))
 	{
-		DWORD GID = strtoul(row[0], NULL, 10);
+		DWORD GID = strtoul(row[0].c_str(), NULL, 10);
 
 		TGuild &r_info = TouchGuild(GID);
 
-		strlcpy(r_info.szName, row[1], sizeof(r_info.szName));
+		strlcpy(r_info.szName, row[1].c_str(), sizeof(r_info.szName));
-		str_to_number(r_info.ladder_point, row[2]);
+		str_to_number(r_info.ladder_point, row[2].c_str());
-		str_to_number(r_info.win, row[3]);
+		str_to_number(r_info.win, row[3].c_str());
-		str_to_number(r_info.draw, row[4]);
+		str_to_number(r_info.draw, row[4].c_str());
-		str_to_number(r_info.loss, row[5]);
+		str_to_number(r_info.loss, row[5].c_str());
-		str_to_number(r_info.gold, row[6]);
+		str_to_number(r_info.gold, row[6].c_str());
-		str_to_number(r_info.level, row[7]);
+		str_to_number(r_info.level, row[7].c_str());
 
 		SPDLOG_DEBUG(
 			"GuildWar: {:24} ladder {:<5} win {:<3} draw {:<3} loss {:<3}",
@@ -157,12 +168,25 @@ void CGuildManager::ParseResult(SQLResult * pRes)
 
 void CGuildManager::Initialize()
 {
-	char szQuery[1024];
+	auto pool = CDBManager::instance().GetConnectionPool();
-	snprintf(szQuery, sizeof(szQuery), "SELECT id, name, ladder_point, win, draw, loss, gold, level FROM guild%s", GetTablePostfix());
+	auto conn = pool->acquire();
-	std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
 
-	if (pmsg->Get()->uiNumRows)
+	try
-		ParseResult(pmsg->Get());
+	{
+		pqxx::work txn{*conn};
+		pqxx::result result = txn.exec("SELECT id, name, ladder_point, win, draw, loss, gold, level FROM player.guild");
+		std::size_t const numRows = std::size(result);
+
+		if (result.size())
+			ParseResult(result);
+
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return;
+	}
 
 	char str[128 + 1];
 
@@ -187,21 +211,39 @@ void CGuildManager::Initialize()
 
 void CGuildManager::Load(DWORD dwGuildID)
 {
-	char szQuery[1024];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery), "SELECT id, name, ladder_point, win, draw, loss, gold, level FROM guild%s WHERE id=%u", GetTablePostfix(), dwGuildID);
+	try
-	std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+	{
+		pqxx::work txn{*conn};
+		pqxx::result result = txn.exec_params("SELECT id, name, ladder_point, win, draw, loss, gold, level FROM player.guild WHERE id=$1", pqxx::params{dwGuildID});
+		std::size_t const numRows = std::size(result);
 
-	if (pmsg->Get()->uiNumRows)
+		if (result.size())
-		ParseResult(pmsg->Get());
+			ParseResult(result);
+
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return;
+	}
 }
 
 void CGuildManager::QueryRanking()
 {
-	char szQuery[256];
+	CDBManager::instance().AsyncQuery("SELECT id, name, ladder_point FROM player.guild ORDER BY ladder_point DESC LIMIT 20", pqxx::params{},
-	snprintf(szQuery, sizeof(szQuery), "SELECT id,name,ladder_point FROM guild%s ORDER BY ladder_point DESC LIMIT 20", GetTablePostfix());
+									  [this](const pqxx::result &result, const std::string &error)
+									  {
+										  if (!error.empty())
+										  {
+											  return;
+										  }
 
-	CDBManager::instance().ReturnQuery(szQuery, QID_GUILD_RANKING, 0, 0);
+										  CGuildManager::ResultRanking(result);
+									  });
 }
 
 int CGuildManager::GetRanking(DWORD dwGID)
@@ -214,22 +256,19 @@ int CGuildManager::GetRanking(DWORD dwGID)
 	return std::clamp(it->second, 0, GUILD_RANK_MAX_NUM);
 }
 
-void CGuildManager::ResultRanking(MYSQL_RES * pRes)
+void CGuildManager::ResultRanking(pqxx::result result)
 {
-	if (!pRes)
-		return;
-
 	int iLastLadderPoint = -1;
 	int iRank = 0;
 
 	map_kLadderPointRankingByGID.clear();
 
-	MYSQL_ROW row;
+	for (auto row : result)
-
-	while ((row = mysql_fetch_row(pRes)))
 	{
-		DWORD	dwGID = 0; str_to_number(dwGID, row[0]);
+		DWORD dwGID = 0;
-		int	iLadderPoint = 0; str_to_number(iLadderPoint, row[2]);
+		str_to_number(dwGID, row[0].c_str());
+		int iLadderPoint = 0;
+		str_to_number(iLadderPoint, row[2].c_str());
 
 		if (iLadderPoint != iLastLadderPoint)
 			++iRank;
@@ -896,8 +935,7 @@ void CGuildManager::BootReserveWar()
 	const char *c_apszQuery[2] =
 		{
 			"SELECT id, guild1, guild2, UNIX_TIMESTAMP(time), type, warprice, initscore, bet_from, bet_to, power1, power2, handicap FROM guild_war_reservation WHERE started=1 AND winner=-1",
-		"SELECT id, guild1, guild2, UNIX_TIMESTAMP(time), type, warprice, initscore, bet_from, bet_to, power1, power2, handicap FROM guild_war_reservation WHERE started=0"
+			"SELECT id, guild1, guild2, UNIX_TIMESTAMP(time), type, warprice, initscore, bet_from, bet_to, power1, power2, handicap FROM guild_war_reservation WHERE started=0"};
-	};
 
 	for (int i = 0; i < 2; ++i)
 	{
@@ -956,35 +994,51 @@ void CGuildManager::BootReserveWar()
 
 int GetAverageGuildMemberLevel(DWORD dwGID)
 {
-	char szQuery[QUERY_MAX_LEN];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery), 
+	try
-			"SELECT AVG(level) FROM guild_member%s, player%s AS p WHERE guild_id=%u AND guild_member%s.pid=p.id", 
+	{
-			GetTablePostfix(), GetTablePostfix(), dwGID, GetTablePostfix());
+		pqxx::work txn{*conn};
+		pqxx::row row = txn.exec_params1("SELECT AVG(level) FROM player.guild_member, player.player AS p WHERE guild_id=$1 AND player.guild_member.pid=p.id", pqxx::params{dwGID});
 
-	std::unique_ptr<SQLMsg> msg(CDBManager::instance().DirectQuery(szQuery));
+		int nAverageLevel = 0;
+		str_to_number(nAverageLevel, row[0].c_str());
 
-	MYSQL_ROW row;
+		txn.commit();
-	row = mysql_fetch_row(msg->Get()->pSQLResult);
 
-	int nAverageLevel = 0; str_to_number(nAverageLevel, row[0]);
 		return nAverageLevel;
 	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return;
+	}
+}
 
 int GetGuildMemberCount(DWORD dwGID)
 {
-	char szQuery[QUERY_MAX_LEN];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery), "SELECT COUNT(*) FROM guild_member%s WHERE guild_id=%u", GetTablePostfix(), dwGID);
+	try
+	{
+		pqxx::work txn{*conn};
+		pqxx::row row = txn.exec_params1("SELECT COUNT(*) FROM player.guild_member WHERE guild_id=$1", pqxx::params{dwGID});
 
-	std::unique_ptr<SQLMsg> msg(CDBManager::instance().DirectQuery(szQuery));
+		DWORD dwCount = 0;
+		str_to_number(dwCount, row[0].c_str());
 
-	MYSQL_ROW row;
+		txn.commit();
-	row = mysql_fetch_row(msg->Get()->pSQLResult);
 
-	DWORD dwCount = 0; str_to_number(dwCount, row[0]);
 		return dwCount;
 	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return;
+	}
+}
 
 bool CGuildManager::ReserveWar(TPacketGuildWar *p)
 {
@@ -1013,7 +1067,7 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p)
 	// 파워 계산
 	TGuild &k1 = TouchGuild(GID1);
 
-	lvp = c_aiScoreByLevel[std::min<size_t>(GUILD_MAX_LEVEL, k1.level)];
+	lvp = c_aiScoreByLevel[std::min<std::size_t>(GUILD_MAX_LEVEL, k1.level)];
 	rkp = c_aiScoreByRanking[GetRanking(GID1)];
 	alv = GetAverageGuildMemberLevel(GID1);
 	mc = GetGuildMemberCount(GID1);
@@ -1029,7 +1083,7 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p)
 	// 파워 계산
 	TGuild &k2 = TouchGuild(GID2);
 
-	lvp = c_aiScoreByLevel[std::min<size_t>(GUILD_MAX_LEVEL, k2.level)];
+	lvp = c_aiScoreByLevel[std::min<std::size_t>(GUILD_MAX_LEVEL, k2.level)];
 	rkp = c_aiScoreByRanking[GetRanking(GID2)];
 	alv = GetAverageGuildMemberLevel(GID2);
 	mc = GetGuildMemberCount(GID2);
@@ -1058,28 +1112,38 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p)
 	SPDLOG_DEBUG("GuildWar: handicap {}", t.lHandicap);
 
 	// 쿼리
-	char szQuery[512];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery),
+	try
-			"INSERT INTO guild_war_reservation (guild1, guild2, time, type, warprice, initscore, power1, power2, handicap) "
+	{
-			"VALUES(%u, %u, DATE_ADD(NOW(), INTERVAL 180 SECOND), %u, %d, %d, %d, %d, %d)",
+		pqxx::work txn{*conn};
-			GID1, GID2, p->bType, p->lWarPrice, p->lInitialScore, t.lPowerFrom, t.lPowerTo, t.lHandicap);
+		pqxx::result result = txn.exec_params(
+			"INSERT INTO player.guild_war_reservation (guild1, guild2, time, type, warprice, initscore, power1, power2, handicap) "
+			"VALUES($1, $2, DATE_ADD(NOW(), INTERVAL 180 SECOND), $3, $4, $5, $6, $7, $8) RETURNING id",
+			pqxx::params{GID1, GID2, p->bType, p->lWarPrice, p->lInitialScore, t.lPowerFrom, t.lPowerTo, t.lHandicap});
 
-	std::unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		txn.commit();
 
-	if (pmsg->Get()->uiAffectedRows == 0 || pmsg->Get()->uiInsertID == 0 || pmsg->Get()->uiAffectedRows == (uint32_t)-1)
+		if (result.size() == 0)
 		{
 			SPDLOG_ERROR("GuildWar: Cannot insert row");
 			return false;
 		}
 
-	t.dwID = pmsg->Get()->uiInsertID;
+		t.dwID = result.at(0)[0].as<DWORD>();
 
 		m_map_kWarReserve.insert(std::make_pair(t.dwID, new CGuildWarReserve(t)));
 
 		CClientManager::instance().ForwardPacket(HEADER_DG_GUILD_WAR_RESERVE_ADD, &t, sizeof(TGuildWarReserve));
 		return true;
 	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		false;
+	}
+}
 
 void CGuildManager::ProcessReserveWar()
 {
@@ -1488,4 +1552,3 @@ void CGuildWarReserve::End(int iScoreFrom, int iScoreTo)
 			break;
 	}
 }
-

src/db/src/GuildManager.h

@@ -199,7 +199,7 @@ class CGuildManager : public singleton<CGuildManager>
 	void MoneyChange(DWORD dwGuild, DWORD dwGold);
 
 	void QueryRanking();
-	void	ResultRanking(MYSQL_RES * pRes);
+	void ResultRanking(pqxx::result pRes);
 	int GetRanking(DWORD dwGID);
 
 	//
@@ -215,7 +215,7 @@ class CGuildManager : public singleton<CGuildManager>
 	bool ChangeMaster(DWORD dwGID, DWORD dwFrom, DWORD dwTo);
 
 private:
-	void ParseResult(SQLResult * pRes);
+	void ParseResult(pqxx::result pRes);
 
 	void RemoveWar(DWORD GID1, DWORD GID2); // erase war from m_WarMap and set end on priority queue
 

src/db/src/ItemAwardManager.cpp

@@ -6,8 +6,6 @@
 
 #include "ClientManager.h"
 
-
-
 DWORD g_dwLastCachedItemAwardID = 0;
 ItemAwardManager::ItemAwardManager()
 {

src/db/src/ItemAwardManager.h

@@ -33,6 +33,7 @@ class ItemAwardManager : public singleton<ItemAwardManager>
 	// gift notify
 	std::map<DWORD, TItemAward *> &GetMapAward();
 	std::map<std::string, std::set<TItemAward *>> &GetMapkSetAwardByLogin();
+
 private:
 	// ID, ItemAward pair
 	std::map<DWORD, TItemAward *> m_map_award;

src/db/src/ItemIDRangeManager.cpp

@@ -74,7 +74,8 @@ TItemIDRangeTable CItemIDRangeManager::GetRange()
 			FCheckCollision f(ret);
 			CClientManager::instance().for_each_peer(f);
 
-			if (f.hasCollision == false) return ret;
+			if (f.hasCollision == false)
+				return ret;
 		}
 	}
 
@@ -83,32 +84,26 @@ TItemIDRangeTable CItemIDRangeManager::GetRange()
 
 	return ret;
 }
+#include <pqxx/pqxx>
+#include <spdlog/spdlog.h>
 
 bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable &range)
 {
-	char szQuery[1024];
 	DWORD dwItemMaxID = 0;
-	SQLMsg* pMsg = NULL;
-	MYSQL_ROW row;
 
-	snprintf(szQuery, sizeof(szQuery), "SELECT MAX(id) FROM item%s WHERE id >= %u and id <= %u", GetTablePostfix(), dwMin, dwMax);
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	pMsg = CDBManager::instance().DirectQuery(szQuery);
+	try
-
-	if (pMsg != NULL)
 	{
-		if (pMsg->Get()->uiNumRows > 0)
+		pqxx::work txn(*conn);
-		{
-			row = mysql_fetch_row(pMsg->Get()->pSQLResult);
-			str_to_number(dwItemMaxID, row[0]);
-		}
-		delete pMsg;
-	}
 
-	if (dwItemMaxID == 0)
+		auto maxRow = txn.exec_params1("SELECT MAX(id) FROM item WHERE id >= $1 AND id <= $2", dwMin, dwMax);
-		dwItemMaxID = dwMin;
+
-	else
+		if (!maxRow[0].is_null())
-		dwItemMaxID++;
+			dwItemMaxID = maxRow[0].as<DWORD>();
+
+		dwItemMaxID = (dwItemMaxID == 0) ? dwMin : dwItemMaxID + 1;
 
 		if ((dwMax < dwItemMaxID) || (dwMax - dwItemMaxID < cs_dwMinimumRemainCount))
 		{
@@ -121,18 +116,9 @@ bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable
 			range.dwMax = dwMax;
 			range.dwUsableItemIDMin = dwItemMaxID;
 
-		snprintf(szQuery, sizeof(szQuery), "SELECT COUNT(*) FROM item%s WHERE id >= %u AND id <= %u", 
+			auto countRow = txn.exec_params1("SELECT COUNT(*) FROM item WHERE id >= $1 AND id <= $2", range.dwUsableItemIDMin, range.dwMax);
-				GetTablePostfix(), range.dwUsableItemIDMin, range.dwMax);
 
-		pMsg = CDBManager::instance().DirectQuery(szQuery);
+			DWORD count = countRow[0].as<DWORD>();
-
-		if (pMsg != NULL)
-		{
-			if (pMsg->Get()->uiNumRows > 0)
-			{
-				DWORD count = 0;
-				row = mysql_fetch_row(pMsg->Get()->pSQLResult);
-				str_to_number(count, row[0]);
 
 			if (count > 0)
 			{
@@ -146,8 +132,11 @@ bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable
 			}
 		}
 
-			delete pMsg;
+		txn.commit();
 	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CItemIDRangeManager::BuildRange] Query error: {}", e.what());
 	}
 
 	return false;
@@ -162,4 +151,3 @@ void CItemIDRangeManager::UpdateRange(DWORD dwMin, DWORD dwMax)
 		m_listData.push_back(range);
 	}
 }
-

src/db/src/ItemIDRangeManager.h

@@ -2,7 +2,8 @@
 #ifndef __INC_METIN_II_ITEM_ID_RANGE_MANAGER_H__
 #define __INC_METIN_II_ITEM_ID_RANGE_MANAGER_H__
 
-namespace {
+namespace
+{
 	static const uint32_t cs_dwMaxItemID = 4290000000UL;
 	static const uint32_t cs_dwMinimumRange = 10000000UL;
 	static const uint32_t cs_dwMinimumRemainCount = 10000UL;

src/db/src/Lock.cpp

@@ -12,39 +12,23 @@ CLock::~CLock()
 void CLock::Initialize()
 {
 	m_bLocked = false;
-#ifndef __WIN32__
 	pthread_mutex_init(&m_lock, NULL);
-#else
-	::InitializeCriticalSection(&m_lock);
-#endif
 }
 
 void CLock::Destroy()
 {
 	assert(!m_bLocked && "lock didn't released");
-#ifndef __WIN32__
 	pthread_mutex_destroy(&m_lock);
-#else
-	::DeleteCriticalSection(&m_lock);
-#endif
 }
 
 int CLock::Trylock()
 {
-#ifndef __WIN32__
 	return pthread_mutex_trylock(&m_lock);
-#else
-	return ::TryEnterCriticalSection(&m_lock);
-#endif
 }
 
 void CLock::Lock()
 {
-#ifndef __WIN32__
 	pthread_mutex_lock(&m_lock);
-#else
-	::EnterCriticalSection(&m_lock);
-#endif
 	m_bLocked = true;
 }
 
@@ -52,9 +36,5 @@ void CLock::Unlock()
 {
 	assert(m_bLocked && "lock didn't issued");
 	m_bLocked = false;
-#ifndef __WIN32__
 	pthread_mutex_unlock(&m_lock);
-#else
-	::LeaveCriticalSection(&m_lock);
-#endif
 }

src/db/src/Lock.h

@@ -2,11 +2,7 @@
 #ifndef __INC_LOCK_H__
 #define __INC_LOCK_H__
 
-#ifdef __WIN32__
-typedef CRITICAL_SECTION	lock_t;
-#else
 typedef pthread_mutex_t lock_t;
-#endif
 
 class CLock
 {

src/db/src/LoginData.cpp

@@ -118,4 +118,3 @@ DWORD * CLoginData::GetPremiumPtr()
 {
 	return &m_aiPremiumTimes[0];
 }
-

src/db/src/Main.cpp

@@ -10,7 +10,11 @@
 #include "Marriage.h"
 #include "Monarch.h"
 #include "ItemIDRangeManager.h"
+#ifndef __INTELLISENSE__
 #include <version.h>
+#else
+#include <../../../common/version.h>
+#endif
 #include <signal.h>
 
 void SetTablePostfix(const char *c_pszTablePostfix);
@@ -20,7 +24,6 @@ std::string g_stTablePostfix;
 std::string g_stLocaleNameColumn = "name";
 std::string g_stLocale = "euckr";
 
-
 BOOL g_test_server = false;
 
 // 단위 초
@@ -30,15 +33,10 @@ int g_iItemCacheFlushSeconds = 60*5;
 // g_iLogoutSeconds 수치는 g_iPlayerCacheFlushSeconds 와 g_iItemCacheFlushSeconds 보다 길어야 한다.
 int g_iLogoutSeconds = 60 * 10;
 
-
 // MYSHOP_PRICE_LIST
 int g_iItemPriceListTableCacheFlushSeconds = 540;
 // END_OF_MYSHOP_PRICE_LIST
 
-#ifdef __FreeBSD__
-extern const char * _malloc_options;
-#endif
-
 void emergency_sig(int sig)
 {
 	if (sig == SIGSEGV)
@@ -55,10 +53,6 @@ int main()
 	WriteVersion();
 	log_init();
 
-#ifdef __FreeBSD__
-	_malloc_options = "A";
-#endif
-
 	CConfig Config;
 	CDBManager DBManager;
 	CClientManager ClientManager;
@@ -82,21 +76,23 @@ int main()
 	signal_timer_disable();
 
 	DBManager.Quit();
-	int iCount;
 
-	while (true)
+	// TODO Check if this is really needed, this should just be cleaning up queued queries
-	{
+	// int iCount;
-		iCount = 0;
 
-		iCount += CDBManager::instance().CountReturnQuery(SQL_PLAYER);
+	// while (true)
-		iCount += CDBManager::instance().CountAsyncQuery(SQL_PLAYER);
+	// {
+	// 	iCount = 0;
 
-		if (iCount == 0)
+	// 	iCount += CDBManager::instance().CountReturnQuery(SQL_PLAYER);
-			break;
+	// 	iCount += CDBManager::instance().CountAsyncQuery(SQL_PLAYER);
 
-		usleep(1000);
+	// 	if (iCount == 0)
-		SPDLOG_DEBUG("WAITING_QUERY_COUNT {}", iCount);
+	// 		break;
-	}
+
+	// 	usleep(1000);
+	// 	SPDLOG_DEBUG("WAITING_QUERY_COUNT {}", iCount);
+	// }
 
 	log_destroy();
 
@@ -185,7 +181,8 @@ int Start()
 	//
 	if (CConfig::instance().GetValue("CACHE_FLUSH_LIMIT_PER_SECOND", szBuf, 256))
 	{
-		DWORD dwVal = 0; str_to_number(dwVal, szBuf);
+		DWORD dwVal = 0;
+		str_to_number(dwVal, szBuf);
 		CClientManager::instance().SetCacheFlushCountLimit(dwVal);
 	}
 
@@ -208,58 +205,16 @@ int Start()
 	int iPort;
 	char line[256 + 1];
 
-	if (CConfig::instance().GetValue("SQL_PLAYER", line, 256)) {
 	sscanf(line, " %s %s %s %s %d ", szAddr, szDB, szUser, szPassword, &iPort);
-        SPDLOG_DEBUG("Connecting to MySQL server (player)");
+	SPDLOG_DEBUG("Connecting to PostgreSQL server");
 
-		if (!CDBManager::instance().Connect(SQL_PLAYER, szAddr, iPort, szDB, szUser, szPassword)) {
+	if (!CDBManager::instance().Connect(szAddr, iPort, szDB, szUser, szPassword))
-			SPDLOG_CRITICAL("Connection to MySQL server (player) failed!");
-			return false;
-		}
-
-		SPDLOG_INFO("Connected to MySQL server (player)");
-	}
-	else {
-		SPDLOG_CRITICAL("SQL_PLAYER not configured");
-		return false;
-	}
-
-	if (CConfig::instance().GetValue("SQL_ACCOUNT", line, 256)) {
-		sscanf(line, " %s %s %s %s %d ", szAddr, szDB, szUser, szPassword, &iPort);
-		SPDLOG_DEBUG("Connecting to MySQL server (account)");
-
-		if (!CDBManager::instance().Connect(SQL_ACCOUNT, szAddr, iPort, szDB, szUser, szPassword)) {
-			SPDLOG_CRITICAL("Connection to MySQL server (account) failed!");
-			return false;
-		}
-
-		SPDLOG_INFO("Connected to MySQL server (account)");
-	}
-	else
 	{
-		SPDLOG_CRITICAL("SQL_ACCOUNT not configured");
+		SPDLOG_CRITICAL("Connection to PostgreSQL server failed!");
 		return false;
 	}
 
-	if (CConfig::instance().GetValue("SQL_COMMON", line, 256))
+	SPDLOG_INFO("Connected to PostgreSQL server");
-	{
-		sscanf(line, " %s %s %s %s %d ", szAddr, szDB, szUser, szPassword, &iPort);
-		SPDLOG_DEBUG("Connecting to MySQL server (common)");
-
-
-		if (!CDBManager::instance().Connect(SQL_COMMON, szAddr, iPort, szDB, szUser, szPassword))
-		{
-			SPDLOG_CRITICAL("Connection to MySQL server (common) failed!");
-			return false;
-		}
-
-		SPDLOG_INFO("Connected to MySQL server (common)");
-	}
-	else
-	{
-		SPDLOG_CRITICAL("SQL_COMMON not configured");
-		return false;
-	}
 
 	if (!CClientManager::instance().Initialize())
 	{
@@ -269,9 +224,7 @@ int Start()
 
 	SPDLOG_INFO("ClientManager initialization OK");
 
-#ifndef __WIN32__
 	signal(SIGUSR1, emergency_sig);
-#endif
 	signal(SIGSEGV, emergency_sig);
 	return true;
 }

src/db/src/Main.h

@@ -2,8 +2,6 @@
 #define __INC_MAIN_H__
 
 int Start();
-void End();
 const char *GetTablePostfix();
-const char * GetPlayerDBName();
 
 #endif

src/db/src/Marriage.cpp

@@ -34,31 +34,32 @@ namespace marriage
 
 	bool CManager::Initialize()
 	{
-		char szQuery[1024];
+		auto pool = CDBManager::instance().GetConnectionPool();
+		auto conn = pool->acquire();
 
-		snprintf(szQuery, sizeof(szQuery),
+		try
-				"SELECT pid1, pid2, love_point, time, is_married, p1.name, p2.name FROM marriage, player%s as p1, player%s as p2 WHERE p1.id = pid1 AND p2.id = pid2",
-				GetTablePostfix(), GetTablePostfix());
-
-		unique_ptr<SQLMsg> pmsg_delete(CDBManager::instance().DirectQuery("DELETE FROM marriage WHERE is_married = 0"));
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
-
-		SQLResult * pRes = pmsg->Get();
-		SPDLOG_DEBUG("MarriageList(size={})", pRes->uiNumRows);
-
-		if (pRes->uiNumRows > 0)
 		{
-			for (uint uiRow = 0; uiRow != pRes->uiNumRows; ++uiRow)
+			pqxx::work txn{*conn};
-			{
+			txn.exec("DELETE FROM player.marriage WHERE is_married = false");
-				MYSQL_ROW row = mysql_fetch_row(pRes->pSQLResult);
+			pqxx::result result = txn.exec("SELECT player_id_1, player_id_2, love_points, created_at, is_married, p1.name, p2.name FROM player.marriage, player.player as p1, player.player as p2 WHERE p1.id = player_id_1 AND p2.id = player_id_2");
 
-				DWORD pid1 = 0; str_to_number(pid1, row[0]);
+			std::size_t const numRows = std::size(result);
-				DWORD pid2 = 0; str_to_number(pid2, row[1]);
+			SPDLOG_DEBUG("MarriageList(size={})", numRows);
-				int love_point = 0; str_to_number(love_point, row[2]);
+
-				DWORD time = 0; str_to_number(time, row[3]);
+			for (auto row : result)
-				BYTE is_married = 0; str_to_number(is_married, row[4]);
+			{
-				const char* name1 = row[5];
+				DWORD pid1 = 0;
-				const char* name2 = row[6];
+				str_to_number(pid1, row[0].c_str());
+				DWORD pid2 = 0;
+				str_to_number(pid2, row[1].c_str());
+				int love_point = 0;
+				str_to_number(love_point, row[2].c_str());
+				DWORD time = 0;
+				str_to_number(time, row[3].c_str());
+				BYTE is_married = 0;
+				str_to_number(is_married, row[4].c_str());
+				const char *name1 = row[5].c_str();
+				const char *name2 = row[6].c_str();
 
 				TMarriage *pMarriage = new TMarriage(pid1, pid2, love_point, time, is_married, name1, name2);
 				m_Marriages.insert(pMarriage);
@@ -67,7 +68,15 @@ namespace marriage
 
 				SPDLOG_DEBUG("Marriage {}: LP:{} TM:{} ST:{} {:10}:{:16} {:10}:{:16} ", uiRow, love_point, time, is_married, pid1, name1, pid2, name2);
 			}
+
+			txn.commit();
 		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::Initialize] Query error: {}", e.what());
+			return false;
+		}
+
 		return true;
 	}
 
@@ -98,18 +107,29 @@ namespace marriage
 
 		Align(dwPID1, dwPID2);
 
-		char szQuery[512];
+		auto pool = CDBManager::instance().GetConnectionPool();
-		snprintf(szQuery, sizeof(szQuery), "INSERT INTO marriage(pid1, pid2, love_point, time) VALUES (%u, %u, 0, %u)", dwPID1, dwPID2, now);
+		auto conn = pool->acquire();
 
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		try
+		{
+			pqxx::work txn{*conn};
+			pqxx::result result = txn.exec_params("INSERT INTO player.marriage(player_id_1, player_id_2, love_points, created_at) VALUES ($1, $2, 0, $3) RETURNING id", dwPID1, dwPID2, now);
+			std::size_t const numRows = std::size(result);
 
-		SQLResult* res = pmsg->Get();
+			if (numRows == 0)
-		if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
 			{
 				SPDLOG_ERROR("cannot insert marriage");
 				return;
 			}
 
+			txn.commit();
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::Add] Query error: {}", e.what());
+			return;
+		}
+
 		SPDLOG_DEBUG("MARRIAGE ADD {} {}", dwPID1, dwPID2);
 
 		TMarriage *pMarriage = new TMarriage(dwPID1, dwPID2, 0, now, 0, szName1, szName2);
@@ -137,19 +157,29 @@ namespace marriage
 
 		Align(dwPID1, dwPID2);
 
-		char szQuery[512];
+		auto pool = CDBManager::instance().GetConnectionPool();
-		snprintf(szQuery, sizeof(szQuery), "UPDATE marriage SET love_point = %d, is_married = %d WHERE pid1 = %u AND pid2 = %u", 
+		auto conn = pool->acquire();
-				iLovePoint, byMarried, pMarriage->pid1, pMarriage->pid2);
 
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		try
+		{
+			pqxx::work txn{*conn};
+			pqxx::result result = txn.exec_params("UPDATE player.marriage SET love_points=$1, is_married=$2 WHERE player_id_1=$3 AND player_id_2=$4 RETURNING id", iLovePoint, byMarried, pMarriage->pid1, pMarriage->pid2);
+			std::size_t const numRows = std::size(result);
 
-		SQLResult* res = pmsg->Get();
+			if (numRows == 0)
-		if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
 			{
 				SPDLOG_ERROR("cannot update marriage : PID:{} {}", dwPID1, dwPID2);
 				return;
 			}
 
+			txn.commit();
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::Update] Query error: {}", e.what());
+			return;
+		}
+
 		SPDLOG_DEBUG("MARRIAGE UPDATE PID:{} {} LP:{} ST:{}", dwPID1, dwPID2, iLovePoint, byMarried);
 		pMarriage->love_point = iLovePoint;
 		pMarriage->is_married = byMarried;
@@ -184,18 +214,29 @@ namespace marriage
 
 		Align(dwPID1, dwPID2);
 
-		char szQuery[512];
+		auto pool = CDBManager::instance().GetConnectionPool();
-		snprintf(szQuery, sizeof(szQuery), "DELETE FROM marriage WHERE pid1 = %u AND pid2 = %u", dwPID1, dwPID2);
+		auto conn = pool->acquire();
 
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		try
+		{
+			pqxx::work txn{*conn};
+			pqxx::result result = txn.exec_params("DELETE FROM player.marriage WHERE player_id_1=$1 AND player_id_2=$2", dwPID1, dwPID2);
+			std::size_t const numRows = std::size(result);
 
-		SQLResult* res = pmsg->Get();
+			if (numRows == 0)
-		if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
 			{
 				SPDLOG_ERROR("cannot delete marriage : PID:{} {}", dwPID1, dwPID2);
 				return;
 			}
 
+			txn.commit();
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::Remove] Query error: {}", e.what());
+			return;
+		}
+
 		SPDLOG_DEBUG("MARRIAGE REMOVE PID:{} {}", dwPID1, dwPID2);
 
 		m_Marriages.erase(pMarriage);
@@ -227,19 +268,29 @@ namespace marriage
 
 		Align(dwPID1, dwPID2);
 
-		char szQuery[512];
+		auto pool = CDBManager::instance().GetConnectionPool();
-		snprintf(szQuery, sizeof(szQuery), "UPDATE marriage SET is_married = 1 WHERE pid1 = %u AND pid2 = %u", 
+		auto conn = pool->acquire();
-				pMarriage->pid1, pMarriage->pid2);
 
-		unique_ptr<SQLMsg> pmsg(CDBManager::instance().DirectQuery(szQuery));
+		try
+		{
+			pqxx::work txn{*conn};
+			pqxx::result result = txn.exec_params("UPDATE player.marriage SET is_married = 1 WHERE player_id_1=$1 AND player_id_2=$2", pMarriage->pid1, pMarriage->pid2);
+			std::size_t const numRows = std::size(result);
 
-		SQLResult* res = pmsg->Get();
+			if (numRows == 0)
-		if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1)
 			{
 				SPDLOG_ERROR("cannot change engage to marriage : PID:{} {}", dwPID1, dwPID2);
 				return;
 			}
 
+			txn.commit();
+		}
+		catch (const std::exception &e)
+		{
+			SPDLOG_ERROR("[CManager::EngageToMarriage] Query error: {}", e.what());
+			return;
+		}
+
 		SPDLOG_DEBUG("MARRIAGE ENGAGE->MARRIAGE PID:{} {}", dwPID1, dwPID2);
 		pMarriage->is_married = 1;
 

src/db/src/Monarch.cpp

@@ -27,11 +27,9 @@ bool CMonarch::VoteMonarch(DWORD pid, DWORD selectdpid)
 		p->selectedpid = selectdpid;
 		m_map_MonarchElection.insert(MAP_MONARCHELECTION::value_type(pid, p));
 
-		char szQuery[256];
+		CDBManager::instance().AsyncQuery(
-		snprintf(szQuery, sizeof(szQuery),
+			"INSERT INTO player.monarch_election(player_id, selected_player_id, election_at) VALUES($1, $2, now())",
-				"INSERT INTO monarch_election(pid, selectedpid, electiondata) VALUES(%d, %d, now())", pid, selectdpid);
+			pqxx::params(pid, selectdpid));
-
-		CDBManager::instance().AsyncQuery(szQuery);
 		return 1;
 	}
 
@@ -85,11 +83,10 @@ bool CMonarch::AddCandidacy(DWORD pid, const char * name)
 	strlcpy(info.name, name, sizeof(info.name));
 	m_vec_MonarchCandidacy.push_back(info);
 
-	char szQuery[256];
+	CDBManager::instance().AsyncQuery(
-	snprintf(szQuery, sizeof(szQuery),
+		"INSERT INTO player.monarch_candidacy(player_id, date) VALUES($1, now())",
-			"INSERT INTO monarch_candidacy(pid, date) VALUES(%d, now())", pid);
+		pqxx::params(pid));
 
-	CDBManager::instance().AsyncQuery(szQuery);
 	return true;
 }
 
@@ -100,17 +97,17 @@ bool CMonarch::DelCandidacy(const char * name)
 	{
 		if (0 == strncmp(it->name, name, sizeof(it->name)))
 		{
-			char szQuery[256];
+			CDBManager::instance().AsyncQuery(
-			snprintf(szQuery, sizeof(szQuery),
+				"DELETE FROM player.monarch_candidacy WHERE player_id=$1",
-					"DELETE FROM monarch_candidacy WHERE pid=%d ", it->pid);
+				pqxx::params(it->pid));
-			CDBManager::instance().AsyncQuery(szQuery);
 
 			m_vec_MonarchCandidacy.erase(it);
+
 			return true;
 		}
 	}
-	return false;
 
+	return false;
 }
 
 bool CMonarch::IsMonarch(int Empire, DWORD pid)
@@ -129,10 +126,9 @@ bool CMonarch::AddMoney(int Empire, int64_t Money)
 
 	int64_t Money64 = m_MonarchInfo.money[Empire];
 
-	char szQuery[1024];	
+	CDBManager::instance().AsyncQuery(
-	snprintf(szQuery, sizeof(szQuery), "UPDATE monarch set money=%ld where empire=%d", Money64, Empire);
+		"UPDATE player.monarch SET money=$1 WHERE empire=$2",
-
+		pqxx::params(Money64, Empire));
-	CDBManager::instance().AsyncQuery(szQuery);
 
 	return true;
 }
@@ -145,10 +141,10 @@ bool CMonarch::DecMoney(int Empire, int64_t Money)
 
 	int64_t Money64 = m_MonarchInfo.money[Empire];
 
-	char szQuery[1024];	
+	CDBManager::instance().AsyncQuery(
-	snprintf(szQuery, sizeof(szQuery), "UPDATE monarch set money=%ld where empire=%d", Money64, Empire);
+		"UPDATE player.monarch SET money=$1 WHERE empire=$2",
+		pqxx::params(Money64, Empire));
 
-	CDBManager::instance().AsyncQuery(szQuery);
 	return true;
 }
 
@@ -162,11 +158,9 @@ bool CMonarch::TakeMoney(int Empire, DWORD pid, int64_t Money)
 
 	m_MonarchInfo.money[Empire] -= Money;
 
-	char szQuery[1024];	
+	CDBManager::instance().AsyncQuery(
-	snprintf(szQuery, sizeof(szQuery), 
+		"UPDATE player.monarch SET money=$1 WHERE empire=$2",
-			"UPDATE monarch set money=%ld; where empire=%d", m_MonarchInfo.money[Empire], Empire);
+		pqxx::params(m_MonarchInfo.money[Empire], Empire));
-
-	CDBManager::instance().AsyncQuery(szQuery);
 
 	SPDLOG_TRACE("[MONARCH] Take money empire({}) money({})", Empire, m_MonarchInfo.money[Empire]);
 	return true;
@@ -175,119 +169,154 @@ bool CMonarch::TakeMoney(int Empire, DWORD pid, int64_t Money)
 bool CMonarch::LoadMonarch()
 {
 	MonarchInfo *p = &m_MonarchInfo;
-    char szQuery[256];
-	snprintf(szQuery, sizeof(szQuery), "SELECT empire, pid, name, money, windate FROM monarch a, player%s b where a.pid=b.id", GetTablePostfix());
-    SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER);
 
-    if (pMsg->Get()->uiNumRows == 0)
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
+
+	try
+	{
+		pqxx::work txn{*conn};
+		pqxx::result result = txn.exec("SELECT empire, player_id, name, money, win_at FROM player.monarch m, player.player p WHERE m.player_id=p.id");
+		std::size_t const numRows = std::size(result);
+
+		if (numRows == 0)
 		{
-        delete pMsg;
 			return false;
 		}
 
-    MYSQL_ROW row;
+		for (auto row : result)
-    for (int n = 0; (row = mysql_fetch_row(pMsg->Get()->pSQLResult)) != NULL; ++n)
 		{
-        int idx = 0;
+			int Empire = row[0].as<int>();
-        int Empire = 0; str_to_number(Empire, row[idx++]);
+			str_to_number(p->pid[Empire], row[1].c_str());
+			strlcpy(p->name[Empire], row[2].c_str(), sizeof(p->name[Empire]));
 
-        str_to_number(p->pid[Empire], row[idx++]);
+			str_to_number(p->money[Empire], row[3].c_str());
-		strlcpy(p->name[Empire], row[idx++], sizeof(p->name[Empire]));
+			strlcpy(p->date[Empire], row[4].c_str(), sizeof(p->date[Empire]));
-
-        str_to_number(p->money[Empire], row[idx++]);
-		strlcpy(p->date[Empire], row[idx++], sizeof(p->date[Empire]));
 
 			SPDLOG_TRACE("[LOAD_MONARCH] Empire {} pid {} money {} windate {}", Empire, p->pid[Empire], p->money[Empire], p->date[Empire]);
 		}
 
-    delete pMsg;
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::LoadMonarch] Query error: {}", e.what());
+		return false;
+	}
+
 	return true;
 }
 
 bool CMonarch::SetMonarch(const char *name)
 {
 	MonarchInfo *p = &m_MonarchInfo;
-    char szQuery[256];
 
-	snprintf(szQuery, sizeof(szQuery), "SELECT empire, pid, name FROM player a where a.name = '%s'", name);
+	auto pool = CDBManager::instance().GetConnectionPool();
-    SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER);
+	auto conn = pool->acquire();
 
-    if (pMsg->Get()->uiNumRows == 0)
+	try
+	{
+		pqxx::work txn{*conn};
+		// TODO Look at this, this should probably not iterate and just get one value instead
+		pqxx::result result = txn.exec_params("SELECT empire, player_id, name, money FROM player.player WHERE name=$1", name);
+		std::size_t const numRows = std::size(result);
+
+		if (numRows == 0)
 		{
-        delete pMsg;
 			return false;
 		}
 
-    MYSQL_ROW row;
 		int Empire = 0;
-    for (int n = 0; (row = mysql_fetch_row(pMsg->Get()->pSQLResult)) != NULL; ++n)
+		for (auto row : result)
 		{
-        int idx = 0;
+			Empire = row[0].as<int>();
-        str_to_number(Empire, row[idx++]);
 
-        str_to_number(p->pid[Empire], row[idx++]);
+			str_to_number(p->pid[Empire], row[1].c_str());
-		strlcpy(p->name[Empire], row[idx++], sizeof(p->name[Empire]));
+			strlcpy(p->name[Empire], row[2].c_str(), sizeof(p->name[Empire]));
-        p->money[Empire] = atoll(row[idx++]);
+			p->money[Empire] = atoll(row[3].c_str());
 
 			SPDLOG_TRACE("[Set_MONARCH] Empire {} pid {} money {} windate {}", Empire, p->pid[Empire], p->money[Empire], p->date[Empire]);
 		}
-    delete pMsg;
 
-	//db에 입력
+		txn.commit();
-	snprintf(szQuery, sizeof(szQuery),
+
-					"REPLACE INTO monarch (empire, name, windate, money) VALUES(%d, %d, now(), %ld)", Empire, p->pid[Empire], p->money[Empire]);
+		CDBManager::instance().AsyncQuery(
+			"REPLACE INTO player.monarch (empire, name, win_at, money) VALUES($1, $2, now(), $3)",
+			pqxx::params{Empire, p->pid[Empire], p->money[Empire]});
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::SetMonarch] Query error: {}", e.what());
+		return false;
+	}
 
- 	CDBManager::instance().AsyncQuery(szQuery, SQL_PLAYER);	
 	return true;
 }
 
 bool CMonarch::DelMonarch(int Empire)
 {
-	char szQuery[256];
+	auto pool = CDBManager::instance().GetConnectionPool();
+	auto conn = pool->acquire();
 
-	snprintf(szQuery, sizeof(szQuery), "DELETE from monarch where empire=%d", Empire);
+	try
-	SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER);
+	{
-
+		pqxx::work txn{*conn};
-	if (pMsg->Get()->uiNumRows == 0)
+		pqxx::result result = txn.exec_params("DELETE FROM player.monarch WHERE empire=$1 RETURNING id", Empire);
+		std::size_t const numRows = std::size(result);
+
+		if (numRows == 0)
 		{
-		delete pMsg;
 			return false;
 		}
 
-	delete pMsg;
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::DelMonarch] Query error: {}", e.what());
+		return false;
+	}
 
 	memset(m_MonarchInfo.name[Empire], 0, sizeof(m_MonarchInfo.name[Empire]));
 	m_MonarchInfo.money[Empire] = 0;
 	m_MonarchInfo.pid[Empire] = 0;
+
 	return true;
 }
 
 bool CMonarch::DelMonarch(const char *name)
 {
-	for (int n = 1; n < 4; ++n)
+	auto pool = CDBManager::instance().GetConnectionPool();
-	{
+	auto conn = pool->acquire();
-		if (0 == strncmp(m_MonarchInfo.name[n], name, sizeof(m_MonarchInfo.name[n])))
-		{
-			char szQuery[256];
 
-			int Empire = n;
+	try
-			snprintf(szQuery, sizeof(szQuery), "DELETE from monarch where name=%d", Empire);
+	{
-			SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER);
+		pqxx::work txn{*conn};
-
+		pqxx::result result = txn.exec_params("DELETE FROM player.monarch WHERE name=$1 RETURNING empire", name);
-			if (pMsg->Get()->uiNumRows == 0)
+		std::size_t const numRows = std::size(result);
+
+		if (numRows == 0)
 		{
-				SPDLOG_ERROR(" DirectQuery failed({})", szQuery);
-				delete pMsg;
 			return false;
 		}
 
-			delete pMsg;
+		for (auto row : result)
+		{
+			int Empire = row[0].as<int>();
 
-			memset(m_MonarchInfo.name[Empire], 0, 32);
+			memset(m_MonarchInfo.name[Empire], 0, sizeof(m_MonarchInfo.name[Empire]));
 			m_MonarchInfo.money[Empire] = 0;
 			m_MonarchInfo.pid[Empire] = 0;
+
 			return true;
 		}
+
+		txn.commit();
+	}
+	catch (const std::exception &e)
+	{
+		SPDLOG_ERROR("[CMonarch::DelMonarch(name)] Query error: {}", e.what());
+		return false;
 	}
 
 	return false;

src/db/src/MoneyLog.cpp

@@ -31,24 +31,6 @@ void CMoneyLog::Save()
 		}
 		m_MoneyLogContainer[bType].clear();
 	}
-	/*
-	   CPeer* peer = GetPeer();
-
-	   peer->
-
-	   for (BYTE bType = 0; bType < MONEY_LOG_TYPE_MAX_NUM; bType++)
-	   {
-	//"INSERT INTO money_log%s VALUES('%s', %d, %d, %d)", CClientManager::instance().GetTablePostfix(), 
-	typeof(m_MoneyLogContainer[bType].begin()) it;
-	for (it = m_MoneyLogContainer[bType].begin(); it != m_MoneyLogContainer[bType].end(); ++it)
-	{
-	typeof(it->second.begin()) 
-	}
-	}
-
-	for (BYTE bType = 0; bType < MONEY_LOG_TYPE_MAX_NUM; bType++)
-	m_MoneyLogContainer[bType].clear()
-	*/
 }
 
 void CMoneyLog::AddLog(BYTE bType, DWORD dwVnum, int iGold)

src/db/src/Peer.cpp

@@ -68,7 +68,8 @@ bool CPeer::PeekPacket(int & iBytesProceed, BYTE & header, DWORD & dwHandle, DWO
 		return false;
 
 	const char *buf = (const char *)GetRecvBuffer(iBytesProceed + 9);
-    if (!buf) {
+	if (!buf)
+	{
 		SPDLOG_ERROR("PeekPacket: Failed to get network buffer!");
 		return false;
 	}
@@ -94,7 +95,8 @@ bool CPeer::PeekPacket(int & iBytesProceed, BYTE & header, DWORD & dwHandle, DWO
 
 	// Ensure that all the required data is available in a contiguous area
 	buf = (const char *)GetRecvBuffer(iBytesProceed + dwLength + 9);
-    if (!buf) {
+	if (!buf)
+	{
 		SPDLOG_ERROR("PeekPacket: Failed to get network buffer!");
 		return false;
 	}
@@ -160,7 +162,8 @@ void CPeer::SendSpareItemIDRange()
 
 bool CPeer::SetItemIDRange(TItemIDRangeTable itemRange)
 {
-	if (itemRange.dwMin == 0 || itemRange.dwMax == 0 || itemRange.dwUsableItemIDMin == 0) return false;
+	if (itemRange.dwMin == 0 || itemRange.dwMax == 0 || itemRange.dwUsableItemIDMin == 0)
+		return false;
 
 	m_itemRange = itemRange;
 	SPDLOG_DEBUG("ItemIDRange: SET {} {} ~ {} start: {}", GetPublicIP(), m_itemRange.dwMin, m_itemRange.dwMax, m_itemRange.dwUsableItemIDMin);
@@ -170,7 +173,8 @@ bool CPeer::SetItemIDRange(TItemIDRangeTable itemRange)
 
 bool CPeer::SetSpareItemIDRange(TItemIDRangeTable itemRange)
 {
-	if (itemRange.dwMin == 0 || itemRange.dwMax == 0 || itemRange.dwUsableItemIDMin == 0) return false;
+	if (itemRange.dwMin == 0 || itemRange.dwMax == 0 || itemRange.dwUsableItemIDMin == 0)
+		return false;
 
 	m_itemSpareRange = itemRange;
 	SPDLOG_DEBUG("ItemIDRange: SPARE SET {} {} ~ {} start: {}", GetPublicIP(), m_itemSpareRange.dwMin, m_itemSpareRange.dwMax,
@@ -197,5 +201,3 @@ bool CPeer::CheckItemIDRangeCollision(TItemIDRangeTable itemRange)
 
 	return true;
 }
-
-

src/db/src/PeerBase.cpp

@@ -14,7 +14,8 @@ CPeerBase::~CPeerBase()
 
 void CPeerBase::Destroy()
 {
-    if (m_bufferevent) {
+    if (m_bufferevent)
+    {
         bufferevent_free(m_bufferevent);
         m_bufferevent = nullptr;
     }
@@ -22,12 +23,14 @@ void CPeerBase::Destroy()
 
 bool CPeerBase::Accept(bufferevent *bufev, sockaddr *addr)
 {
-    if (!bufev) {
+    if (!bufev)
+    {
         SPDLOG_ERROR("Cannot accept empty bufferevent!");
         return false;
     }
 
-    if (m_bufferevent != nullptr) {
+    if (m_bufferevent != nullptr)
+    {
         SPDLOG_ERROR("Peer is already initialized");
         return false;
     }
@@ -39,7 +42,8 @@ bool CPeerBase::Accept(bufferevent* bufev, sockaddr* addr)
     sockaddr_in *peer;
     sockaddr_in6 *peer6;
 
-    switch (addr->sa_family) {
+    switch (addr->sa_family)
+    {
     case AF_INET:
         peer = (sockaddr_in *)addr;
         inet_ntop(AF_INET, &(peer->sin_addr), m_host, INET_ADDRSTRLEN);
@@ -90,7 +94,8 @@ void CPeerBase::Encode(const void* data, size_t size)
         return;
     }
 
-	if (bufferevent_write(m_bufferevent, data, size) != 0) {
+    if (bufferevent_write(m_bufferevent, data, size) != 0)
+    {
         SPDLOG_ERROR("Buffer write error!");
         return;
     }

src/db/src/PeerBase.h

@@ -3,7 +3,8 @@
 
 #include <event2/bufferevent.h>
 
-class CPeerBase {
+class CPeerBase
+{
 protected:
 	virtual void OnAccept() = 0;
 	virtual void OnClose() = 0;

src/db/src/PrivManager.cpp

@@ -39,7 +39,8 @@ void CPrivManager::Update()
 			// ADD_GUILD_PRIV_TIME
 			// 길드에 중복적으로 보너스가 설정되었을 경우 map 의 value 가 갱신(수정) 되었으므로
 			// TPrivGuildData 의 포인터가 같을때 실제로 삭제해 주고 게임서버들에게 cast 해 준다.
-			if (it != m_aPrivGuild[p->type].end() && it->second == p) {
+			if (it != m_aPrivGuild[p->type].end() && it->second == p)
+			{
 				m_aPrivGuild[p->type].erase(it);
 				SendChangeGuildPriv(p->guild_id, p->type, 0, 0);
 				// END_OF_ADD_GUILD_PRIV_TIME

src/db/src/PrivManager.h

@@ -18,7 +18,8 @@ struct TPrivEmpireData
 
 	TPrivEmpireData(BYTE type, int value, BYTE empire, time_t end_time_sec)
 		: type(type), value(value), bRemoved(false), empire(empire), end_time_sec(end_time_sec)
-    {}
+	{
+	}
 	// END_OF_ADD_EMPIRE_PRIV_TIME
 };
 
@@ -37,7 +38,8 @@ struct TPrivGuildData
 
 	TPrivGuildData(BYTE type, int value, DWORD guild_id, time_t _end_time_sec)
 		: type(type), value(value), bRemoved(false), guild_id(guild_id), end_time_sec(_end_time_sec)
-    {}
+	{
+	}
 	// END_OF_ADD_GUILD_PRIV_TIME
 };
 
@@ -49,7 +51,8 @@ struct TPrivCharData
 	DWORD pid;
 	TPrivCharData(BYTE type, int value, DWORD pid)
 		: type(type), value(value), bRemoved(false), pid(pid)
-    {}
+	{
+	}
 };
 
 /**
@@ -76,7 +79,6 @@ class CPrivManager : public singleton<CPrivManager>
 	void SendPrivOnSetup(CPeer *peer);
 
 private:
-
 	// ADD_GUILD_PRIV_TIME
 	void SendChangeGuildPriv(DWORD guild_id, BYTE type, int value, time_t end_time_sec);
 	// END_OF_ADD_GUILD_PRIV_TIME

src/db/src/ProtoReader.cpp

@@ -52,11 +52,10 @@ static string* StringSplit(string strOrigin, string strTok)
 	return strResult; // 결과return
 }
 
-
-
 int get_Item_Type_Value(string inputString)
 {
-	string arType[] = {"ITEM_NONE", "ITEM_WEAPON",
+	string arType[] = {
+		"ITEM_NONE", "ITEM_WEAPON",
 		"ITEM_ARMOR", "ITEM_USE",
 		"ITEM_AUTOUSE", "ITEM_MATERIAL",
 		"ITEM_SPECIAL", "ITEM_TOOL",
@@ -81,12 +80,13 @@ int get_Item_Type_Value(string inputString)
 		"ITEM_BELT", // 35개 (EItemTypes 값으로 치면 34)
 	};
 
-	
 	int retInt = -1;
 	// cout << "Type : " << typeStr << " -> ";
-	for (int j=0;j<sizeof(arType)/sizeof(arType[0]);j++) {
+	for (int j = 0; j < sizeof(arType) / sizeof(arType[0]); j++)
+	{
 		string tempString = arType[j];
-		if	(inputString.find(tempString)!=string::npos && tempString.find(inputString)!=string::npos) {
+		if (inputString.find(tempString) != string::npos && tempString.find(inputString) != string::npos)
+		{
 			// cout << j << " ";
 			retInt = j;
 			break;
@@ -95,7 +95,6 @@ int get_Item_Type_Value(string inputString)
 	// cout << endl;
 
 	return retInt;
-
 }
 
 int get_Item_SubType_Value(int type_value, string inputString)
@@ -126,7 +125,8 @@ int get_Item_SubType_Value(int type_value, string inputString)
 	static string arSub29[] = {"DS_SLOT1", "DS_SLOT2", "DS_SLOT3", "DS_SLOT4", "DS_SLOT5", "DS_SLOT6"};
 	static string arSub31[] = {"EXTRACT_DRAGON_SOUL", "EXTRACT_DRAGON_HEART"};
 
-	static string* arSubType[] = {0,	//0
+	static string *arSubType[] = {
+		0,		 // 0
 		arSub1,	 // 1
 		arSub2,	 // 2
 		arSub3,	 // 3
@@ -200,7 +200,6 @@ int get_Item_SubType_Value(int type_value, string inputString)
 		0, // 34 벨트
 	};
 
-
 	assert(_countof(arSubType) > type_value && "Subtype rule: Out of range!!");
 
 	// assert 안 먹히는 듯..
@@ -211,14 +210,16 @@ int get_Item_SubType_Value(int type_value, string inputString)
 	}
 
 	// 아이템 타입의 서브타입 어레이가 존재하는지 알아보고, 없으면 0 리턴
-	if (arSubType[type_value]==0) {
+	if (arSubType[type_value] == 0)
+	{
 		return 0;
 	}
 	//
 
 	int retInt = -1;
 	// cout << "SubType : " << subTypeStr << " -> ";
-	for (int j=0;j<arNumberOfSubtype[type_value];j++) {
+	for (int j = 0; j < arNumberOfSubtype[type_value]; j++)
+	{
 		string tempString = arSubType[type_value][j];
 		string tempInputString = trim(inputString);
 		if (tempInputString.compare(tempString) == 0)
@@ -233,10 +234,6 @@ int get_Item_SubType_Value(int type_value, string inputString)
 	return retInt;
 }
 
-
-
-
-
 int get_Item_AntiFlag_Value(string inputString)
 {
 
@@ -244,15 +241,16 @@ int get_Item_AntiFlag_Value(string inputString)
 						   "ANTI_GET", "ANTI_DROP", "ANTI_SELL", "ANTI_EMPIRE_A", "ANTI_EMPIRE_B", "ANTI_EMPIRE_C",
 						   "ANTI_SAVE", "ANTI_GIVE", "ANTI_PKDROP", "ANTI_STACK", "ANTI_MYSHOP", "ANTI_SAFEBOX"};
 
-
 	int retValue = 0;
 	string *arInputString = StringSplit(inputString, "|"); // 프로토 정보 내용을 단어별로 쪼갠 배열.
-	for(int i =0;i<sizeof(arAntiFlag)/sizeof(arAntiFlag[0]);i++) {
+	for (int i = 0; i < sizeof(arAntiFlag) / sizeof(arAntiFlag[0]); i++)
+	{
 		string tempString = arAntiFlag[i];
 		for (int j = 0; j < 30; j++) // 최대 30개 단어까지. (하드코딩)
 		{
 			string tempString2 = arInputString[j];
-			if (tempString2.compare(tempString)==0) {				//일치하는지 확인.
+			if (tempString2.compare(tempString) == 0)
+			{ // 일치하는지 확인.
 				retValue = retValue + pow((float)2, (float)i);
 			}
 
@@ -273,15 +271,16 @@ int get_Item_Flag_Value(string inputString)
 					   "ITEM_MAKECOUNT", "ITEM_IRREMOVABLE", "CONFIRM_WHEN_USE", "QUEST_USE", "QUEST_USE_MULTIPLE",
 					   "QUEST_GIVE", "ITEM_QUEST", "LOG", "STACKABLE", "SLOW_QUERY", "REFINEABLE", "IRREMOVABLE", "ITEM_APPLICABLE"};
 
-
 	int retValue = 0;
 	string *arInputString = StringSplit(inputString, "|"); // 프로토 정보 내용을 단어별로 쪼갠 배열.
-	for(int i =0;i<sizeof(arFlag)/sizeof(arFlag[0]);i++) {
+	for (int i = 0; i < sizeof(arFlag) / sizeof(arFlag[0]); i++)
+	{
 		string tempString = arFlag[i];
 		for (int j = 0; j < 30; j++) // 최대 30개 단어까지. (하드코딩)
 		{
 			string tempString2 = arInputString[j];
-			if (tempString2.compare(tempString)==0) {				//일치하는지 확인.
+			if (tempString2.compare(tempString) == 0)
+			{ // 일치하는지 확인.
 				retValue = retValue + pow((float)2, (float)i);
 			}
 
@@ -301,15 +300,16 @@ int get_Item_WearFlag_Value(string inputString)
 	string arWearrFlag[] = {"WEAR_BODY", "WEAR_HEAD", "WEAR_FOOTS", "WEAR_WRIST", "WEAR_WEAPON", "WEAR_NECK", "WEAR_EAR", "WEAR_SHIELD", "WEAR_UNIQUE",
 							"WEAR_ARROW", "WEAR_HAIR", "WEAR_ABILITY"};
 
-
 	int retValue = 0;
 	string *arInputString = StringSplit(inputString, "|"); // 프로토 정보 내용을 단어별로 쪼갠 배열.
-	for(int i =0;i<sizeof(arWearrFlag)/sizeof(arWearrFlag[0]);i++) {
+	for (int i = 0; i < sizeof(arWearrFlag) / sizeof(arWearrFlag[0]); i++)
+	{
 		string tempString = arWearrFlag[i];
 		for (int j = 0; j < 30; j++) // 최대 30개 단어까지. (하드코딩)
 		{
 			string tempString2 = arInputString[j];
-			if (tempString2.compare(tempString)==0) {				//일치하는지 확인.
+			if (tempString2.compare(tempString) == 0)
+			{ // 일치하는지 확인.
 				retValue = retValue + pow((float)2, (float)i);
 			}
 
@@ -330,12 +330,14 @@ int get_Item_Immune_Value(string inputString)
 
 	int retValue = 0;
 	string *arInputString = StringSplit(inputString, "|"); // 프로토 정보 내용을 단어별로 쪼갠 배열.
-	for(int i =0;i<sizeof(arImmune)/sizeof(arImmune[0]);i++) {
+	for (int i = 0; i < sizeof(arImmune) / sizeof(arImmune[0]); i++)
+	{
 		string tempString = arImmune[i];
 		for (int j = 0; j < 30; j++) // 최대 30개 단어까지. (하드코딩)
 		{
 			string tempString2 = arInputString[j];
-			if (tempString2.compare(tempString)==0) {				//일치하는지 확인.
+			if (tempString2.compare(tempString) == 0)
+			{ // 일치하는지 확인.
 				retValue = retValue + pow((float)2, (float)i);
 			}
 
@@ -349,16 +351,14 @@ int get_Item_Immune_Value(string inputString)
 	return retValue;
 }
 
-
-
-
 int get_Item_LimitType_Value(string inputString)
 {
 	string arLimitType[] = {"LIMIT_NONE", "LEVEL", "STR", "DEX", "INT", "CON", "PC_BANG", "REAL_TIME", "REAL_TIME_FIRST_USE", "TIMER_BASED_ON_WEAR"};
 
 	int retInt = -1;
 	// cout << "LimitType : " << limitTypeStr << " -> ";
-	for (int j=0;j<sizeof(arLimitType)/sizeof(arLimitType[0]);j++) {
+	for (int j = 0; j < sizeof(arLimitType) / sizeof(arLimitType[0]); j++)
+	{
 		string tempString = arLimitType[j];
 		string tempInputString = trim(inputString);
 		if (tempInputString.compare(tempString) == 0)
@@ -373,31 +373,107 @@ int get_Item_LimitType_Value(string inputString)
 	return retInt;
 }
 
-
 int get_Item_ApplyType_Value(string inputString)
 {
-	string arApplyType[] = {"APPLY_NONE", "APPLY_MAX_HP", "APPLY_MAX_SP", "APPLY_CON", "APPLY_INT", "APPLY_STR", "APPLY_DEX", "APPLY_ATT_SPEED",
+	string arApplyType[] = {
-			"APPLY_MOV_SPEED", "APPLY_CAST_SPEED", "APPLY_HP_REGEN", "APPLY_SP_REGEN", "APPLY_POISON_PCT", "APPLY_STUN_PCT",
+		"APPLY_NONE",
-			"APPLY_SLOW_PCT", "APPLY_CRITICAL_PCT", "APPLY_PENETRATE_PCT", "APPLY_ATTBONUS_HUMAN", "APPLY_ATTBONUS_ANIMAL",
+		"APPLY_MAX_HP",
-			"APPLY_ATTBONUS_ORC", "APPLY_ATTBONUS_MILGYO", "APPLY_ATTBONUS_UNDEAD", "APPLY_ATTBONUS_DEVIL", "APPLY_STEAL_HP",
+		"APPLY_MAX_SP",
-			"APPLY_STEAL_SP", "APPLY_MANA_BURN_PCT", "APPLY_DAMAGE_SP_RECOVER", "APPLY_BLOCK", "APPLY_DODGE", "APPLY_RESIST_SWORD",
+		"APPLY_CON",
-			"APPLY_RESIST_TWOHAND", "APPLY_RESIST_DAGGER", "APPLY_RESIST_BELL", "APPLY_RESIST_FAN", "APPLY_RESIST_BOW", "APPLY_RESIST_FIRE",
+		"APPLY_INT",
-			"APPLY_RESIST_ELEC", "APPLY_RESIST_MAGIC", "APPLY_RESIST_WIND", "APPLY_REFLECT_MELEE", "APPLY_REFLECT_CURSE", "APPLY_POISON_REDUCE",
+		"APPLY_STR",
-			"APPLY_KILL_SP_RECOVER", "APPLY_EXP_DOUBLE_BONUS", "APPLY_GOLD_DOUBLE_BONUS", "APPLY_ITEM_DROP_BONUS", "APPLY_POTION_BONUS",
+		"APPLY_DEX",
-			"APPLY_KILL_HP_RECOVER", "APPLY_IMMUNE_STUN", "APPLY_IMMUNE_SLOW", "APPLY_IMMUNE_FALL", "APPLY_SKILL", "APPLY_BOW_DISTANCE",
+		"APPLY_ATT_SPEED",
-			"APPLY_ATT_GRADE_BONUS", "APPLY_DEF_GRADE_BONUS", "APPLY_MAGIC_ATT_GRADE", "APPLY_MAGIC_DEF_GRADE", "APPLY_CURSE_PCT",
+		"APPLY_MOV_SPEED",
-			"APPLY_MAX_STAMINA", "APPLY_ATTBONUS_WARRIOR", "APPLY_ATTBONUS_ASSASSIN", "APPLY_ATTBONUS_SURA", "APPLY_ATTBONUS_SHAMAN",
+		"APPLY_CAST_SPEED",
-			"APPLY_ATTBONUS_MONSTER", "APPLY_MALL_ATTBONUS", "APPLY_MALL_DEFBONUS", "APPLY_MALL_EXPBONUS", "APPLY_MALL_ITEMBONUS",
+		"APPLY_HP_REGEN",
-			"APPLY_MALL_GOLDBONUS", "APPLY_MAX_HP_PCT", "APPLY_MAX_SP_PCT", "APPLY_SKILL_DAMAGE_BONUS", "APPLY_NORMAL_HIT_DAMAGE_BONUS",
+		"APPLY_SP_REGEN",
-			"APPLY_SKILL_DEFEND_BONUS", "APPLY_NORMAL_HIT_DEFEND_BONUS", "APPLY_PC_BANG_EXP_BONUS", "APPLY_PC_BANG_DROP_BONUS",
+		"APPLY_POISON_PCT",
-			"APPLY_EXTRACT_HP_PCT", "APPLY_RESIST_WARRIOR", "APPLY_RESIST_ASSASSIN", "APPLY_RESIST_SURA", "APPLY_RESIST_SHAMAN",
+		"APPLY_STUN_PCT",
-			"APPLY_ENERGY",	"APPLY_DEF_GRADE", "APPLY_COSTUME_ATTR_BONUS", "APPLY_MAGIC_ATTBONUS_PER", "APPLY_MELEE_MAGIC_ATTBONUS_PER",
+		"APPLY_SLOW_PCT",
-			"APPLY_RESIST_ICE", "APPLY_RESIST_EARTH", "APPLY_RESIST_DARK", "APPLY_ANTI_CRITICAL_PCT", "APPLY_ANTI_PENETRATE_PCT",
+		"APPLY_CRITICAL_PCT",
+		"APPLY_PENETRATE_PCT",
+		"APPLY_ATTBONUS_HUMAN",
+		"APPLY_ATTBONUS_ANIMAL",
+		"APPLY_ATTBONUS_ORC",
+		"APPLY_ATTBONUS_MILGYO",
+		"APPLY_ATTBONUS_UNDEAD",
+		"APPLY_ATTBONUS_DEVIL",
+		"APPLY_STEAL_HP",
+		"APPLY_STEAL_SP",
+		"APPLY_MANA_BURN_PCT",
+		"APPLY_DAMAGE_SP_RECOVER",
+		"APPLY_BLOCK",
+		"APPLY_DODGE",
+		"APPLY_RESIST_SWORD",
+		"APPLY_RESIST_TWOHAND",
+		"APPLY_RESIST_DAGGER",
+		"APPLY_RESIST_BELL",
+		"APPLY_RESIST_FAN",
+		"APPLY_RESIST_BOW",
+		"APPLY_RESIST_FIRE",
+		"APPLY_RESIST_ELEC",
+		"APPLY_RESIST_MAGIC",
+		"APPLY_RESIST_WIND",
+		"APPLY_REFLECT_MELEE",
+		"APPLY_REFLECT_CURSE",
+		"APPLY_POISON_REDUCE",
+		"APPLY_KILL_SP_RECOVER",
+		"APPLY_EXP_DOUBLE_BONUS",
+		"APPLY_GOLD_DOUBLE_BONUS",
+		"APPLY_ITEM_DROP_BONUS",
+		"APPLY_POTION_BONUS",
+		"APPLY_KILL_HP_RECOVER",
+		"APPLY_IMMUNE_STUN",
+		"APPLY_IMMUNE_SLOW",
+		"APPLY_IMMUNE_FALL",
+		"APPLY_SKILL",
+		"APPLY_BOW_DISTANCE",
+		"APPLY_ATT_GRADE_BONUS",
+		"APPLY_DEF_GRADE_BONUS",
+		"APPLY_MAGIC_ATT_GRADE",
+		"APPLY_MAGIC_DEF_GRADE",
+		"APPLY_CURSE_PCT",
+		"APPLY_MAX_STAMINA",
+		"APPLY_ATTBONUS_WARRIOR",
+		"APPLY_ATTBONUS_ASSASSIN",
+		"APPLY_ATTBONUS_SURA",
+		"APPLY_ATTBONUS_SHAMAN",
+		"APPLY_ATTBONUS_MONSTER",
+		"APPLY_MALL_ATTBONUS",
+		"APPLY_MALL_DEFBONUS",
+		"APPLY_MALL_EXPBONUS",
+		"APPLY_MALL_ITEMBONUS",
+		"APPLY_MALL_GOLDBONUS",
+		"APPLY_MAX_HP_PCT",
+		"APPLY_MAX_SP_PCT",
+		"APPLY_SKILL_DAMAGE_BONUS",
+		"APPLY_NORMAL_HIT_DAMAGE_BONUS",
+		"APPLY_SKILL_DEFEND_BONUS",
+		"APPLY_NORMAL_HIT_DEFEND_BONUS",
+		"APPLY_PC_BANG_EXP_BONUS",
+		"APPLY_PC_BANG_DROP_BONUS",
+		"APPLY_EXTRACT_HP_PCT",
+		"APPLY_RESIST_WARRIOR",
+		"APPLY_RESIST_ASSASSIN",
+		"APPLY_RESIST_SURA",
+		"APPLY_RESIST_SHAMAN",
+		"APPLY_ENERGY",
+		"APPLY_DEF_GRADE",
+		"APPLY_COSTUME_ATTR_BONUS",
+		"APPLY_MAGIC_ATTBONUS_PER",
+		"APPLY_MELEE_MAGIC_ATTBONUS_PER",
+		"APPLY_RESIST_ICE",
+		"APPLY_RESIST_EARTH",
+		"APPLY_RESIST_DARK",
+		"APPLY_ANTI_CRITICAL_PCT",
+		"APPLY_ANTI_PENETRATE_PCT",
 	};
 
 	int retInt = -1;
 	// cout << "ApplyType : " << applyTypeStr << " -> ";
-	for (int j=0;j<sizeof(arApplyType)/sizeof(arApplyType[0]);j++) {
+	for (int j = 0; j < sizeof(arApplyType) / sizeof(arApplyType[0]); j++)
+	{
 		string tempString = arApplyType[j];
 		string tempInputString = trim(inputString);
 		if (tempInputString.compare(tempString) == 0)
@@ -410,20 +486,18 @@ int get_Item_ApplyType_Value(string inputString)
 	// cout << endl;
 
 	return retInt;
-
 }
 
-
 // 몬스터 프로토도 읽는다.
 
-
 int get_Mob_Rank_Value(string inputString)
 {
 	string arRank[] = {"PAWN", "S_PAWN", "KNIGHT", "S_KNIGHT", "BOSS", "KING"};
 
 	int retInt = -1;
 	// cout << "Rank : " << rankStr << " -> ";
-	for (int j=0;j<sizeof(arRank)/sizeof(arRank[0]);j++) {
+	for (int j = 0; j < sizeof(arRank) / sizeof(arRank[0]); j++)
+	{
 		string tempString = arRank[j];
 		string tempInputString = trim(inputString);
 		if (tempInputString.compare(tempString) == 0)
@@ -438,14 +512,14 @@ int get_Mob_Rank_Value(string inputString)
 	return retInt;
 }
 
-
 int get_Mob_Type_Value(string inputString)
 {
 	string arType[] = {"MONSTER", "NPC", "STONE", "WARP", "DOOR", "BUILDING", "PC", "POLYMORPH_PC", "HORSE", "GOTO"};
 
 	int retInt = -1;
 	// cout << "Type : " << typeStr << " -> ";
-	for (int j=0;j<sizeof(arType)/sizeof(arType[0]);j++) {
+	for (int j = 0; j < sizeof(arType) / sizeof(arType[0]); j++)
+	{
 		string tempString = arType[j];
 		string tempInputString = trim(inputString);
 		if (tempInputString.compare(tempString) == 0)
@@ -466,7 +540,8 @@ int get_Mob_BattleType_Value(string inputString)
 
 	int retInt = -1;
 	// cout << "Battle Type : " << battleTypeStr << " -> ";
-	for (int j=0;j<sizeof(arBattleType)/sizeof(arBattleType[0]);j++) {
+	for (int j = 0; j < sizeof(arBattleType) / sizeof(arBattleType[0]); j++)
+	{
 		string tempString = arBattleType[j];
 		string tempInputString = trim(inputString);
 		if (tempInputString.compare(tempString) == 0)
@@ -487,7 +562,8 @@ int get_Mob_Size_Value(string inputString)
 
 	int retInt = 0;
 	// cout << "Size : " << sizeStr << " -> ";
-	for (int j=0;j<sizeof(arSize)/sizeof(arSize[0]);j++) {
+	for (int j = 0; j < sizeof(arSize) / sizeof(arSize[0]); j++)
+	{
 		string tempString = arSize[j];
 		string tempInputString = trim(inputString);
 		if (tempInputString.compare(tempString) == 0)
@@ -506,15 +582,16 @@ int get_Mob_AIFlag_Value(string inputString)
 {
 	string arAIFlag[] = {"AGGR", "NOMOVE", "COWARD", "NOATTSHINSU", "NOATTCHUNJO", "NOATTJINNO", "ATTMOB", "BERSERK", "STONESKIN", "GODSPEED", "DEATHBLOW", "REVIVE"};
 
-
 	int retValue = 0;
 	string *arInputString = StringSplit(inputString, ","); // 프로토 정보 내용을 단어별로 쪼갠 배열.
-	for(int i =0;i<sizeof(arAIFlag)/sizeof(arAIFlag[0]);i++) {
+	for (int i = 0; i < sizeof(arAIFlag) / sizeof(arAIFlag[0]); i++)
+	{
 		string tempString = arAIFlag[i];
 		for (int j = 0; j < 30; j++) // 최대 30개 단어까지. (하드코딩)
 		{
 			string tempString2 = arInputString[j];
-			if (tempString2.compare(tempString)==0) {				//일치하는지 확인.
+			if (tempString2.compare(tempString) == 0)
+			{ // 일치하는지 확인.
 				retValue = retValue + pow((float)2, (float)i);
 			}
 
@@ -534,12 +611,14 @@ int get_Mob_RaceFlag_Value(string inputString)
 
 	int retValue = 0;
 	string *arInputString = StringSplit(inputString, ","); // 프로토 정보 내용을 단어별로 쪼갠 배열.
-	for(int i =0;i<sizeof(arRaceFlag)/sizeof(arRaceFlag[0]);i++) {
+	for (int i = 0; i < sizeof(arRaceFlag) / sizeof(arRaceFlag[0]); i++)
+	{
 		string tempString = arRaceFlag[i];
 		for (int j = 0; j < 30; j++) // 최대 30개 단어까지. (하드코딩)
 		{
 			string tempString2 = arInputString[j];
-			if (tempString2.compare(tempString)==0) {				//일치하는지 확인.
+			if (tempString2.compare(tempString) == 0)
+			{ // 일치하는지 확인.
 				retValue = retValue + pow((float)2, (float)i);
 			}
 
@@ -558,12 +637,14 @@ int get_Mob_ImmuneFlag_Value(string inputString)
 
 	int retValue = 0;
 	string *arInputString = StringSplit(inputString, ","); // 프로토 정보 내용을 단어별로 쪼갠 배열.
-	for(int i =0;i<sizeof(arImmuneFlag)/sizeof(arImmuneFlag[0]);i++) {
+	for (int i = 0; i < sizeof(arImmuneFlag) / sizeof(arImmuneFlag[0]); i++)
+	{
 		string tempString = arImmuneFlag[i];
 		for (int j = 0; j < 30; j++) // 최대 30개 단어까지. (하드코딩)
 		{
 			string tempString2 = arInputString[j];
-			if (tempString2.compare(tempString)==0) {				//일치하는지 확인.
+			if (tempString2.compare(tempString) == 0)
+			{ // 일치하는지 확인.
 				retValue = retValue + pow((float)2, (float)i);
 			}
 
@@ -574,11 +655,9 @@ int get_Mob_ImmuneFlag_Value(string inputString)
 	delete[] arInputString;
 	// cout << "Immune Flag : " << immuneFlagStr << " -> " << retValue << endl;
 
-
 	return retValue;
 }
 
-
 #ifndef __DUMP_PROTO__
 
 // 몹 테이블을 셋팅해준다.
@@ -591,10 +670,13 @@ bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable,std::map<int,c
 	// 3. 지역별 이름 넣어주기.
 	map<int, const char *>::iterator it;
 	it = nameMap.find(mobTable->dwVnum);
-	if (it != nameMap.end()) {
+	if (it != nameMap.end())
+	{
 		const char *localeName = it->second;
 		strlcpy(mobTable->szLocaleName, localeName, sizeof(mobTable->szLocaleName));
-	} else {
+	}
+	else
+	{
 		strlcpy(mobTable->szLocaleName, mobTable->szName, sizeof(mobTable->szLocaleName));
 	}
 
@@ -693,42 +775,66 @@ bool Set_Proto_Item_Table(TItemTable *itemTable, cCsvTable &csvTable,std::map<in
 	int col = 0;
 
 	int dataArray[33];
-	for (int i=0; i<sizeof(dataArray)/sizeof(dataArray[0]);i++) {
+	for (int i = 0; i < sizeof(dataArray) / sizeof(dataArray[0]); i++)
+	{
 		int validCheck = 0;
-		if (i==2) {
+		if (i == 2)
+		{
 			dataArray[i] = get_Item_Type_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==3) {
+		}
+		else if (i == 3)
+		{
 			dataArray[i] = get_Item_SubType_Value(dataArray[i - 1], csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==5) {
+		}
+		else if (i == 5)
+		{
 			dataArray[i] = get_Item_AntiFlag_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==6) {
+		}
+		else if (i == 6)
+		{
 			dataArray[i] = get_Item_Flag_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==7) {
+		}
+		else if (i == 7)
+		{
 			dataArray[i] = get_Item_WearFlag_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==8) {
+		}
+		else if (i == 8)
+		{
 			dataArray[i] = get_Item_Immune_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==14) {
+		}
+		else if (i == 14)
+		{
 			dataArray[i] = get_Item_LimitType_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==16) {
+		}
+		else if (i == 16)
+		{
 			dataArray[i] = get_Item_LimitType_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==18) {
+		}
+		else if (i == 18)
+		{
 			dataArray[i] = get_Item_ApplyType_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==20) {
+		}
+		else if (i == 20)
+		{
 			dataArray[i] = get_Item_ApplyType_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else if (i==22) {
+		}
+		else if (i == 22)
+		{
 			dataArray[i] = get_Item_ApplyType_Value(csvTable.AsStringByIndex(col));
 			validCheck = dataArray[i];
-		} else {
+		}
+		else
+		{
 			str_to_number(dataArray[i], csvTable.AsStringByIndex(col));
 		}
 
@@ -780,10 +886,13 @@ bool Set_Proto_Item_Table(TItemTable *itemTable, cCsvTable &csvTable,std::map<in
 	// 지역별 이름 넣어주기.
 	map<int, const char *>::iterator it;
 	it = nameMap.find(itemTable->dwVnum);
-	if (it != nameMap.end()) {
+	if (it != nameMap.end())
+	{
 		const char *localeName = it->second;
 		strlcpy(itemTable->szLocaleName, localeName, sizeof(itemTable->szLocaleName));
-	} else {
+	}
+	else
+	{
 		strlcpy(itemTable->szLocaleName, itemTable->szName, sizeof(itemTable->szLocaleName));
 	}
 	itemTable->bType = dataArray[2];
@@ -813,7 +922,6 @@ bool Set_Proto_Item_Table(TItemTable *itemTable, cCsvTable &csvTable,std::map<in
 
 		if (LIMIT_TIMER_BASED_ON_WEAR == itemTable->aLimits[i].bType)
 			itemTable->cLimitTimerBasedOnWearIndex = (char)i;
-
 	}
 
 	for (i = 0; i < ITEM_APPLY_MAX_NUM; ++i)

src/db/src/ProtoReader.h

@@ -18,7 +18,6 @@ int get_Item_Immune_Value(std::string inputString);
 int get_Item_LimitType_Value(std::string inputString);
 int get_Item_ApplyType_Value(std::string inputString);
 
-
 // 몬스터 프로토도 읽을 수 있다.
 int get_Mob_Rank_Value(std::string inputString);
 int get_Mob_Type_Value(std::string inputString);

src/db/src/grid.cpp

@@ -126,4 +126,3 @@ unsigned int CGrid::GetSize()
 {
 	return m_iWidth * m_iHeight;
 }
-

src/db/src/stdafx.h

@@ -3,12 +3,7 @@
 
 #include <libthecore/include/stdafx.h>
 
-#ifndef __WIN32__
 #include <semaphore.h>
-#else
-#define isdigit iswdigit
-#define isspace iswspace
-#endif
 
 #include <common/length.h>
 #include <common/tables.h>

src/db/src/version.cpp

@@ -1,8 +1,12 @@
 #include <fmt/core.h>
+#ifndef __INTELLISENSE__
 #include <version.h>
+#else
+#include <../../../common/version.h>
+#endif
 
-void WriteVersion() {
+void WriteVersion()
+{
     fmt::println("Metin2 DB Cache version {} (rev. {}, date: {})", __COMMIT_TAG__, __REVISION__, __COMMIT_DATE__);
     fmt::println("OS: {}, target arch: {}, compiler: {}", __OS_NAME__, __CPU_TARGET__, __COMPILER__);
 }
-

src/game/src/MarkConvert.cpp

@@ -1,10 +1,6 @@
 #include "stdafx.h"
 #include "MarkManager.h"
 
-#ifdef __WIN32__
-#include <direct.h>
-#endif
-
 #define OLD_MARK_INDEX_FILENAME "guild_mark.idx"
 #define OLD_MARK_DATA_FILENAME "guild_mark.tga"
 
@@ -31,18 +27,10 @@ static Pixel * LoadOldGuildMarkImageFile()
 bool GuildMarkConvert(const std::vector<DWORD> & vecGuildID)
 {
 	// 폴더 생성
-#ifndef __WIN32__
 	mkdir("mark", S_IRWXU);
-#else
-	_mkdir("mark");
-#endif
 
 	// 인덱스 파일이 있나? 
-#ifndef __WIN32__
 	if (0 != access(OLD_MARK_INDEX_FILENAME, F_OK))
-#else
-	if (0 != _access(OLD_MARK_INDEX_FILENAME, 0))
-#endif
 		return true;
 
 	// 인덱스 파일 열기
@@ -120,13 +108,8 @@ bool GuildMarkConvert(const std::vector<DWORD> & vecGuildID)
 	fclose(fp);
 
 	// 컨버트는 한번만 하면되므로 파일을 옮겨준다.
-#ifndef __WIN32__
 	system("mv -f guild_mark.idx guild_mark.idx.removable");
 	system("mv -f guild_mark.tga guild_mark.tga.removable");
-#else
-	system("move /Y guild_mark.idx guild_mark.idx.removable");
-	system("move /Y guild_mark.tga guild_mark.tga.removable");
-#endif
 
 	SPDLOG_INFO("Guild Mark Converting Complete.");
 

src/game/src/char_change_empire.cpp

@@ -112,6 +112,9 @@ int CHARACTER::ChangeEmpire(BYTE empire)
 			// 5. 제국 변경 이력을 추가한다.
 			SetChangeEmpireCount();
 
+			SetEmpire(empire);
+			UpdatePacket();
+
 			return 999;
 		}
 	}

src/game/src/config.cpp

@@ -1,8 +1,6 @@
 #include "stdafx.h"
 #include <sstream>
-#ifndef __WIN32__
 #include <ifaddrs.h>
-#endif
 
 #include "constants.h"
 #include "utils.h"

src/game/src/main.cpp

@@ -56,7 +56,11 @@
 #include "skill_power.h"
 #include "SpeedServer.h"
 #include "DragonSoul.h"
+#ifndef __INTELLISENSE__
 #include <version.h>
+#else
+#include <../../../common/version.h>
+#endif
 #include <event2/event.h>
 #include <event2/listener.h>
 #include <event2/dns.h>
@@ -65,20 +69,6 @@
 #include <execinfo.h>
 #endif
 
-//extern const char * _malloc_options;
-#if defined(__FreeBSD__) && defined(DEBUG_ALLOC)
-extern void (*_malloc_message)(const char* p1, const char* p2, const char* p3, const char* p4);
-// FreeBSD _malloc_message replacement
-void WriteMallocMessage(const char* p1, const char* p2, const char* p3, const char* p4) {
-	FILE* fp = ::fopen(DBGALLOC_LOG_FILENAME, "a");
-	if (fp == NULL) {
-		return;
-	}
-	::fprintf(fp, "%s %s %s %s\n", p1, p2, p3, p4);
-	::fclose(fp);
-}
-#endif
-
 // TRAFFIC_PROFILER
 static const DWORD TRAFFIC_PROFILE_FLUSH_CYCLE = 3600; ///< TrafficProfiler 의 Flush cycle. 1시간 간격
 // END_OF_TRAFFIC_PROFILER
@@ -137,7 +127,8 @@ void ContinueOnFatalError()
 
 	std::ostringstream oss;
 	oss << std::endl;
-	for (std::size_t i = 0; i < size; ++i) {
+	for (std::size_t i = 0; i < size; ++i)
+	{
 		oss << "  Stack> " << symbols[i] << std::endl;
 	}
 
@@ -305,7 +296,8 @@ void heartbeat(LPHEART ht, int pulse)
 	}
 }
 
-static void CleanUpForEarlyExit() {
+static void CleanUpForEarlyExit()
+{
 	CancelReloadSpamEvent();
 }
 
@@ -368,14 +360,16 @@ int main(int argc, char **argv)
 	CSpeedServerManager SSManager;
 	DSManager dsManager;
 
-	if (!start(argc, argv)) {
+	if (!start(argc, argv))
+	{
 		CleanUpForEarlyExit();
 		return 0;
 	}
 
 	quest::CQuestManager quest_manager;
 
-	if (!quest_manager.Initialize()) {
+	if (!quest_manager.Initialize())
+	{
 		CleanUpForEarlyExit();
 		return 0;
 	}
@@ -394,7 +388,8 @@ int main(int argc, char **argv)
 	if (g_bTrafficProfileOn)
 		TrafficProfiler::instance().Initialize(TRAFFIC_PROFILE_FLUSH_CYCLE, "ProfileLog");
 
-	while (idle());
+	while (idle())
+		;
 
 	SPDLOG_INFO("<shutdown> Starting...");
 	g_bShutdown = true;
@@ -478,11 +473,6 @@ int start(int argc, char **argv)
 {
 	std::string st_localeServiceName;
 
-	//_malloc_options = "A";
-#if defined(__FreeBSD__) && defined(DEBUG_ALLOC)
-	_malloc_message = WriteMallocMessage;
-#endif
-
 	int ch;
 	while ((ch = getopt(argc, argv, "n:p:erl:tI:")) != -1)
 	{
@@ -574,24 +564,28 @@ int start(int argc, char **argv)
 	// Initialize the network stack
 
 	// Check if the public and internal IP addresses were configured
-    if (g_szInternalIP.empty()) {
+	if (g_szInternalIP.empty())
+	{
 		SPDLOG_CRITICAL("Internal IP address could not be automatically detected. Manually set the IP and try again.");
 		exit(EXIT_FAILURE);
 	}
-    if (g_szPublicIP.empty()) {
+	if (g_szPublicIP.empty())
+	{
 		SPDLOG_CRITICAL("Public IP address could not be automatically detected. Manually set the IP and try again.");
 		exit(EXIT_FAILURE);
 	}
 
 	// Create a new libevent base and listen for new connections
 	ev_base = event_base_new();
-    if (!ev_base) {
+	if (!ev_base)
+	{
 		SPDLOG_CRITICAL("Libevent base initialization FAILED!");
 		exit(EXIT_FAILURE);
 	}
 
 	dns_base = evdns_base_new(ev_base, 1);
-    if (!dns_base) {
+	if (!dns_base)
+	{
 		SPDLOG_CRITICAL("Libevent DNS base initialization FAILED!");
 		exit(EXIT_FAILURE);
 	}
@@ -607,9 +601,9 @@ int start(int argc, char **argv)
 		ev_base,
 		AcceptTCPConnection, nullptr,
 		LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, -1,
-        (const sockaddr*)&sin, sizeof(sin)
+		(const sockaddr *)&sin, sizeof(sin));
-    );
+	if (!tcp_listener)
-    if (!tcp_listener) {
+	{
 		SPDLOG_CRITICAL("TCP listener initialization FAILED!");
 		exit(EXIT_FAILURE);
 	}
@@ -625,9 +619,9 @@ int start(int argc, char **argv)
 		ev_base,
 		AcceptP2PConnection, nullptr,
 		LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, -1,
-        (const sockaddr*)&sin, sizeof(sin)
+		(const sockaddr *)&sin, sizeof(sin));
-    );
+	if (!p2p_listener)
-    if (!p2p_listener) {
+	{
 		SPDLOG_CRITICAL("P2P listener initialization FAILED!");
 		exit(EXIT_FAILURE);
 	}
@@ -636,7 +630,8 @@ int start(int argc, char **argv)
 
 	// Create client connections
 	db_clientdesc = DESC_MANAGER::instance().CreateConnectionDesc(ev_base, dns_base, db_addr, db_port, PHASE_DBCLIENT, true);
-	if (!g_bAuthServer) {
+	if (!g_bAuthServer)
+	{
 		db_clientdesc->UpdateChannelStatus(0, true);
 	}
 
@@ -648,7 +643,6 @@ int start(int argc, char **argv)
 			g_pkAuthMasterDesc = DESC_MANAGER::instance().CreateConnectionDesc(ev_base, dns_base, g_stAuthMasterIP.c_str(), g_wAuthMasterPort, PHASE_P2P, true);
 			P2P_MANAGER::instance().RegisterConnector(g_pkAuthMasterDesc);
 			g_pkAuthMasterDesc->SetP2P(g_wAuthMasterPort, g_bChannel);
-
 		}
 		else
 		{
@@ -682,22 +676,26 @@ void destroy()
 	regen_free();
 
 	SPDLOG_INFO("<shutdown> Closing network stack...");
-    if (tcp_listener) {
+	if (tcp_listener)
+	{
 		evconnlistener_free(tcp_listener);
 		tcp_listener = nullptr;
 	}
 
-    if (p2p_listener) {
+	if (p2p_listener)
+	{
 		evconnlistener_free(p2p_listener);
 		p2p_listener = nullptr;
 	}
 
-    if (dns_base) {
+	if (dns_base)
+	{
 		evdns_base_free(dns_base, 0);
 		dns_base = nullptr;
 	}
 
-    if (ev_base) {
+	if (ev_base)
+	{
 		event_base_free(ev_base);
 		ev_base = nullptr;
 	}
@@ -730,7 +728,8 @@ int idle()
 
 	DWORD t;
 
-	while (passed_pulses--) {
+	while (passed_pulses--)
+	{
 		heartbeat(thecore_heart, ++thecore_heart->pulse);
 
 		// To reduce the possibility of abort() in checkpointing
@@ -743,7 +742,8 @@ int idle()
 	s_dwProfiler[PROF_CHR_UPDATE] += (get_dword_time() - t);
 
 	t = get_dword_time();
-	if (!io_loop(ev_base)) return 0;
+	if (!io_loop(ev_base))
+		return 0;
 	s_dwProfiler[PROF_IO] += (get_dword_time() - t);
 
 	gettimeofday(&now, (struct timezone *)0);
@@ -773,23 +773,11 @@ int idle()
 		memset(&s_dwProfiler[0], 0, sizeof(s_dwProfiler));
 	}
 
-#ifdef __WIN32__
-	if (_kbhit()) {
-		int c = _getch();
-		switch (c) {
-			case 0x1b: // Esc
-				return 0; // shutdown
-				break;
-			default:
-				break;
-		}
-	}
-#endif
-
 	return 1;
 }
 
-static void AcceptError(evconnlistener *listener, void *ctx) {
+static void AcceptError(evconnlistener *listener, void *ctx)
+{
 	struct event_base *base = evconnlistener_get_base(listener);
 	int err = EVUTIL_SOCKET_ERROR();
 	SPDLOG_CRITICAL("Got an error {} ({}) on the listener. Shutting down.", err, evutil_socket_error_to_string(err));
@@ -823,4 +811,3 @@ int io_loop(event_base * base)
 
 	return 1;
 }
-

src/game/src/questmanager.cpp

@@ -1630,7 +1630,6 @@ namespace quest
 			GetCurrentCharacterPtr()->ChatPacket(CHAT_TYPE_PARTY, "LUA_ERROR: quest %s.%s %s", GetCurrentQuestName().c_str(), state_name, event_index_name.c_str() );
 	}
 
-#ifndef __WIN32__
 	void CQuestManager::QuestError(const char* func, int line, const char* fmt, ...)
 	{
 		char szMsg[4096];
@@ -1651,28 +1650,6 @@ namespace quest
 			}
 		}
 	}
-#else
-	void CQuestManager::QuestError(const char* func, int line, const char* fmt, ...)
-	{
-		char szMsg[4096];
-		va_list args;
-
-		va_start(args, fmt);
-		vsnprintf(szMsg, sizeof(szMsg), fmt, args);
-		va_end(args);
-
-		_SPDLOG_ERROR(func, line, "%s", szMsg);
-		if (test_server)
-		{
-			LPCHARACTER ch = GetCurrentCharacterPtr();
-			if (ch)
-			{
-				ch->ChatPacket(CHAT_TYPE_PARTY, "error occurred on [%s:%d]", func,line);
-				ch->ChatPacket(CHAT_TYPE_PARTY, "%s", szMsg);
-			}
-		}
-	}
-#endif
 
 	void CQuestManager::AddServerTimer(const std::string& name, DWORD arg, LPEVENT event)
 	{

src/game/src/questmanager.h

@@ -5,11 +5,7 @@
 
 #include "questnpc.h"
 
-#ifndef __WIN32__
 #define quest_err(fmt, args...) quest::CQuestManager::instance().QuestError(__FUNCTION__, __LINE__, fmt, ##args)
-#else
-#define quest_err(fmt, ...) quest::CQuestManager::instance().QuestError(__FUNCTION__, __LINE__, fmt, __VA_ARGS__)
-#endif
 
 class ITEM;
 class CHARACTER;
@@ -173,12 +169,7 @@ namespace quest
 			void		ClearError() { m_bError = false; }
 			bool		IsError() { return m_bError; }
 			void		WriteRunningStateToSyserr();
-#ifndef __WIN32__
 			void		QuestError(const char* func, int line, const char* fmt, ...);
-#else
-			//void		QuestError(const char* fmt, ...);
-			void		QuestError(const char* func, int line, const char* fmt, ...);
-#endif
 
 			void		RegisterNPCVnum(DWORD dwVnum);
 

src/game/src/utils.h

@@ -38,12 +38,10 @@ inline int DISTANCE_APPROX(int dx, int dy)
 		( min << 7 ) - ( min << 5 ) + ( min << 3 ) - ( min << 1 )) >> 8 );
 }
 
-#ifndef __WIN32__
 inline WORD MAKEWORD(BYTE a, BYTE b)
 {
 	return static_cast<WORD>(a) | (static_cast<WORD>(b) << 8);
 }
-#endif
 
 extern void set_global_time(time_t t);
 extern time_t get_global_time();

src/game/src/version.cpp

@@ -1,8 +1,12 @@
 #include <fmt/core.h>
+#ifndef __INTELLISENSE__
 #include <version.h>
+#else
+#include <../../../common/version.h>
+#endif
 
-void WriteVersion() {
+void WriteVersion()
+{
     fmt::println("Metin2 Game Server version {} (rev. {}, date: {})", __COMMIT_TAG__, __REVISION__, __COMMIT_DATE__);
     fmt::println("OS: {}, target arch: {}, compiler: {}", __OS_NAME__, __CPU_TARGET__, __COMPILER__);
 }
-

src/libpoly/src/Poly.cc

@@ -9,11 +9,7 @@ using namespace std;
 
 double _random()
 {
-#ifndef __WIN32__
     return random() / (2147483648.0);
-#else
-	return rand() / (2147483648.0);
-#endif
 }
 
 int CPoly::my_irandom(double start, double end)

src/libsql/include/CAsyncSQL.h

@@ -181,15 +181,9 @@ class CAsyncSQL
 
 		volatile bool m_bEnd;
 
-#ifndef __WIN32__
 		pthread_t m_hThread;
 		pthread_mutex_t	* m_mtxQuery;
 		pthread_mutex_t	* m_mtxResult;
-#else
-		HANDLE m_hThread;
-		CRITICAL_SECTION* m_mtxQuery;
-		CRITICAL_SECTION* m_mtxResult;
-#endif
 
 		CSemaphore m_sem;
 

src/libsql/include/CStatement.h

@@ -1,41 +0,0 @@
-#ifndef __INC_METIN_II_LIBSQL_STATEMENT_H__
-#define __INC_METIN_II_LIBSQL_STATEMENT_H__
-
-#include "CAsyncSQL.h"
-
-#include <string>
-#include <vector>
-
-class CStmt
-{
-	public:
-		CStmt();
-		virtual ~CStmt();
-
-		bool    Prepare(CAsyncSQL * sql, const char * c_pszQuery);
-		bool    BindParam(enum_field_types type, void * p, int iMaxLen=0);
-		bool    BindResult(enum_field_types type, void * p, int iMaxLen=0);
-		int	Execute();
-		bool    Fetch();
-
-		void    Error(const char * c_pszMsg);
-
-	public:
-		int	iRows;
-
-	private:
-		void    Destroy();
-
-		MYSQL_STMT *            m_pkStmt;
-
-		std::string             m_stQuery;
-
-		std::vector<MYSQL_BIND> m_vec_param;
-		unsigned int            m_uiParamCount;
-		uint64_t *				m_puiParamLen;
-
-		std::vector<MYSQL_BIND> m_vec_result;
-		unsigned int            m_uiResultCount;
-};  
-
-#endif

src/libsql/include/PgAsyncQuery.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <pqxx/pqxx>
+#include <string>
+
+#include <functional>
+using AsyncQueryCallback = std::function<void(const pqxx::result &, const std::string &error)>;
+
+class PgAsyncQuery
+{
+public:
+    int id;
+    std::string query;
+    pqxx::params parameters;
+
+    bool hasCallback;
+    AsyncQueryCallback callback;
+
+    // Fire and Forget AsyncQuery
+    PgAsyncQuery(int msgId, const std::string &sql, const pqxx::params &params = pqxx::params{})
+        : id(msgId), query(sql), parameters(params), hasCallback(false) {}
+
+    // Callback AsyncQuery
+    PgAsyncQuery(int msgId, const std::string &sql, const pqxx::params &params = pqxx::params{}, AsyncQueryCallback cb)
+        : id(msgId), query(sql), parameters(params), hasCallback(true), callback(std::move(cb)) {}
+};

src/libsql/include/PgConnectionPool.h

@@ -0,0 +1,175 @@
+#pragma once
+
+#include <pqxx/pqxx>
+#include <mutex>
+#include <condition_variable>
+#include <queue>
+#include <memory>
+#include <string>
+#include <vector>
+#include <chrono>
+#include <future>
+#include <thread>
+#include <atomic>
+#include <map>
+
+class PgConnectionPool
+{
+public:
+    PgConnectionPool(const char *db_address, int db_port, const char *db_name,
+                     const char *user, const char *pwd,
+                     size_t pool_size = 10,
+                     std::chrono::seconds idle_timeout = std::chrono::seconds(60))
+        : db_address_(db_address), db_port_(db_port), db_name_(db_name),
+          user_(user), pwd_(pwd), max_pool_size_(pool_size),
+          idle_timeout_(idle_timeout), stop_cleaner_(false)
+    {
+        for (size_t i = 0; i < max_pool_size_; ++i)
+        {
+            auto conn = createConnection();
+            pool_.push({std::move(conn), std::chrono::steady_clock::now()});
+        }
+
+        // Start cleanup thread
+        cleaner_thread_ = std::thread(&PgConnectionPool::cleanupIdleConnections, this);
+    }
+
+    ~PgConnectionPool()
+    {
+        stop_cleaner_ = true;
+        cond_.notify_all();
+        if (cleaner_thread_.joinable())
+        {
+            cleaner_thread_.join();
+        }
+
+        std::lock_guard<std::mutex> lock(mutex_);
+        while (!pool_.empty())
+        {
+            auto &entry = pool_.front();
+            if (entry.conn && entry.conn->is_open())
+            {
+                entry.conn->close();
+            }
+            pool_.pop();
+        }
+    }
+
+    // Asynchronous acquire
+    std::future<std::shared_ptr<pqxx::connection>> acquireAsync()
+    {
+        return std::async(std::launch::async, [this]()
+                          { return this->acquire(); });
+    }
+
+    // Blocking acquire
+    std::shared_ptr<pqxx::connection> acquire()
+    {
+        std::unique_lock<std::mutex> lock(mutex_);
+
+        cond_.wait(lock, [this]()
+                   { return !pool_.empty(); });
+
+        ConnectionEntry entry = std::move(pool_.front());
+        pool_.pop();
+
+        if (!entry.conn || !entry.conn->is_open())
+        {
+            entry.conn = createConnection(); // Reconnect if needed
+        }
+
+        return std::shared_ptr<pqxx::connection>(
+            entry.conn.release(),
+            [this](pqxx::connection *p)
+            {
+                std::lock_guard<std::mutex> lock(mutex_);
+                auto now = std::chrono::steady_clock::now();
+                if (p->is_open())
+                {
+                    pool_.push({std::unique_ptr<pqxx::connection>(p), now});
+                }
+                else
+                {
+                    delete p;
+                    pool_.push({createConnection(), now});
+                }
+                cond_.notify_one();
+            });
+    }
+
+private:
+    struct ConnectionEntry
+    {
+        std::unique_ptr<pqxx::connection> conn;
+        std::chrono::steady_clock::time_point last_used;
+    };
+
+    std::unique_ptr<pqxx::connection> createConnection()
+    {
+        std::string conn_str = "host=" + db_address_ +
+                               " port=" + std::to_string(db_port_) +
+                               " dbname=" + db_name_ +
+                               " user=" + user_ +
+                               " password=" + pwd_;
+        try
+        {
+            auto conn = std::make_unique<pqxx::connection>(conn_str);
+            if (!conn->is_open())
+            {
+                throw std::runtime_error("Failed to open DB connection");
+            }
+            return conn;
+        }
+        catch (const std::exception &e)
+        {
+            throw std::runtime_error(std::string("Connection error: ") + e.what());
+        }
+    }
+
+    void cleanupIdleConnections()
+    {
+        while (!stop_cleaner_)
+        {
+            std::this_thread::sleep_for(idle_timeout_ / 2); // Clean more frequently
+
+            std::lock_guard<std::mutex> lock(mutex_);
+            size_t current_size = pool_.size();
+
+            std::queue<ConnectionEntry> temp;
+            auto now = std::chrono::steady_clock::now();
+
+            while (!pool_.empty())
+            {
+                auto entry = std::move(pool_.front());
+                pool_.pop();
+
+                if (std::chrono::duration_cast<std::chrono::seconds>(
+                        now - entry.last_used) > idle_timeout_)
+                {
+                    if (entry.conn && entry.conn->is_open())
+                    {
+                        entry.conn->close();
+                    }
+                }
+                else
+                {
+                    temp.push(std::move(entry));
+                }
+            }
+            pool_ = std::move(temp);
+            cond_.notify_all();
+        }
+    }
+
+    std::string db_address_, db_name_, user_, pwd_;
+    int db_port_;
+    size_t max_pool_size_;
+    std::chrono::seconds idle_timeout_;
+
+    std::queue<ConnectionEntry> pool_;
+    std::mutex mutex_;
+    std::condition_variable cond_;
+
+    std::thread cleaner_thread_;
+    std::atomic<bool> stop_cleaner_;
+};

src/libsql/include/Tellwait.h

@@ -1,8 +1,6 @@
 #ifndef __INC_METIN_II_TELLWAIT_H__
 #define __INC_METIN_II_TELLWAIT_H__
 
-#ifndef __WIN32__
-
 extern void TELL_WAIT();
 
 extern void WAIT_CHILD();
@@ -12,5 +10,3 @@ extern void WAIT_PARENT();
 extern void TELL_PARENT(pid_t pid);
 
 #endif
-
-#endif

src/libsql/src/CAsyncSQL.cpp

@@ -1,6 +1,4 @@
-#ifndef __WIN32__
 #include <sys/time.h>
-#endif
 
 #include <cstdlib>
 #include <cstring>
@@ -8,22 +6,13 @@
 #include "CAsyncSQL.h"
 
 // TODO: Consider providing platform-independent mutex class.
-#ifndef __WIN32__
 #define MUTEX_LOCK(mtx) pthread_mutex_lock(mtx)
 #define MUTEX_UNLOCK(mtx) pthread_mutex_unlock(mtx)
-#else
-#define MUTEX_LOCK(mtx) ::EnterCriticalSection(mtx)
-#define MUTEX_UNLOCK(mtx) ::LeaveCriticalSection(mtx)
-#endif
 
 CAsyncSQL::CAsyncSQL()
 	: m_stHost(""), m_stUser(""), m_stPassword(""), m_stDB(""), m_stLocale(""),
 	m_iMsgCount(0), m_bEnd(false),
-#ifndef __WIN32__
 	m_hThread(0), 
-#else
-	m_hThread(INVALID_HANDLE_VALUE),
-#endif
 	m_mtxQuery(NULL), m_mtxResult(NULL),
 	m_iQueryFinished(0), m_ulThreadID(0), m_bConnected(false), m_iCopiedQuery(0),
 	m_iPort(0)
@@ -51,32 +40,20 @@ void CAsyncSQL::Destroy()
 
 	if (m_mtxQuery)
 	{
-#ifndef __WIN32__
 		pthread_mutex_destroy(m_mtxQuery);
-#else
-		::DeleteCriticalSection(m_mtxQuery);
-#endif
 		delete m_mtxQuery;
 		m_mtxQuery = NULL;
 	}
 
 	if (m_mtxResult)
 	{
-#ifndef __WIN32__
 		pthread_mutex_destroy(m_mtxResult);
-#else
-		::DeleteCriticalSection(m_mtxResult);
-#endif
 		delete m_mtxResult;
 		m_mtxQuery = NULL;
 	}
 }
 
-#ifndef __WIN32__
 void * AsyncSQLThread(void * arg)
-#else
-unsigned int __stdcall AsyncSQLThread(void* arg)
-#endif
 {
 	CAsyncSQL * pSQL = ((CAsyncSQL *) arg);
 
@@ -198,7 +175,6 @@ bool CAsyncSQL::Setup(const char * c_pszHost, const char * c_pszUser, const char
 			return false;
 		}
 		*/
-#ifndef __WIN32__
 		m_mtxQuery = new pthread_mutex_t;
 		m_mtxResult = new pthread_mutex_t;
 
@@ -215,19 +191,6 @@ bool CAsyncSQL::Setup(const char * c_pszHost, const char * c_pszUser, const char
 		}
 
 		pthread_create(&m_hThread, NULL, AsyncSQLThread, this);
-#else
-		m_mtxQuery = new CRITICAL_SECTION;
-		m_mtxResult = new CRITICAL_SECTION;
-
-		::InitializeCriticalSection(m_mtxQuery);
-		::InitializeCriticalSection(m_mtxResult);
-
-		m_hThread = (HANDLE)::_beginthreadex(NULL, 0, AsyncSQLThread, this, 0, NULL);
-		if (m_hThread == INVALID_HANDLE_VALUE) {
-			perror("CAsyncSQL::Setup");
-			return false;
-		}
-#endif
 
 		return true;
 	}
@@ -240,18 +203,11 @@ void CAsyncSQL::Quit()
 	m_bEnd = true;
 	m_sem.Release();
 
-#ifndef __WIN32__
 	if (m_hThread)
 	{
 		pthread_join(m_hThread, NULL);
 		m_hThread = NULL;
 	}
-#else
-	if (m_hThread != INVALID_HANDLE_VALUE) {
-		::WaitForSingleObject(m_hThread, INFINITE);
-		m_hThread = INVALID_HANDLE_VALUE;
-	}
-#endif
 }
 
 SQLMsg * CAsyncSQL::DirectQuery(const char * c_pszQuery)

src/libsql/src/CSemaphore.cpp

@@ -1,8 +1,6 @@
 #include "stdafx.h"
 #include "CSemaphore.h"
 
-#ifndef __WIN32__
-
 CSemaphore::CSemaphore() : m_hSem(NULL)
 {
 	Initialize();
@@ -73,70 +71,3 @@ int CSemaphore::Release(int count)
 
 	return true;
 }
-
-#else
-
-CSemaphore::CSemaphore() : m_hSem(NULL)
-{
-	Initialize();
-}
-
-CSemaphore::~CSemaphore()
-{
-	Destroy();
-}
-
-int CSemaphore::Initialize()
-{
-	Clear();
-
-	m_hSem = ::CreateSemaphore(NULL, 0, 32, NULL);
-
-	if (m_hSem == NULL) {
-		return false;
-	}
-
-	return true;
-}
-
-void CSemaphore::Destroy()
-{
-	Clear();
-}
-
-void CSemaphore::Clear()
-{
-	if (m_hSem == NULL) {
-		return;
-	}
-	::CloseHandle(m_hSem);
-	m_hSem = NULL;
-}
-
-int CSemaphore::Wait()
-{
-	if (!m_hSem)
-		return true;
-
-	DWORD dwWaitResult = ::WaitForSingleObject(m_hSem, INFINITE);
-
-	switch (dwWaitResult) {
-		case WAIT_OBJECT_0:
-			return true;
-		default:
-			break;
-	}
-	return false;
-}
-
-int CSemaphore::Release(int count)
-{
-	if (!m_hSem)
-		return false;
-
-	::ReleaseSemaphore(m_hSem, count, NULL);
-
-	return true;
-}
-
-#endif

src/libsql/src/CStatement.cpp

@@ -1,159 +0,0 @@
-#include "CStatement.h"
-
-#include <cstdlib>
-#include <cstring>
-
-CStmt::CStmt()
-{
-	m_pkStmt = NULL;
-	m_uiParamCount = 0;
-	m_uiResultCount = 0;
-	iRows = 0;
-	m_puiParamLen = NULL;
-}
-
-CStmt::~CStmt()
-{
-	Destroy();
-}
-
-void CStmt::Destroy()
-{
-	if (m_pkStmt)
-	{
-		mysql_stmt_close(m_pkStmt);
-		m_pkStmt = NULL;
-	}
-
-	if (m_puiParamLen)
-	{
-		free(m_puiParamLen);
-		m_puiParamLen = NULL;
-	}
-}
-
-void CStmt::Error(const char * c_pszMsg)
-{
-    SPDLOG_ERROR("SYSERR: {}: [{}] {}", c_pszMsg, mysql_stmt_errno(m_pkStmt), mysql_stmt_error(m_pkStmt));
-}
-
-bool CStmt::Prepare(CAsyncSQL * sql, const char * c_pszQuery)
-{
-	m_pkStmt = mysql_stmt_init(sql->GetSQLHandle());
-	m_stQuery = c_pszQuery;
-
-	if (mysql_stmt_prepare(m_pkStmt, m_stQuery.c_str(), m_stQuery.length()))
-	{
-		Error("mysql_stmt_prepare");
-		return false;
-	}
-
-	int iParamCount = 0;
-
-	for (unsigned int i = 0; i < m_stQuery.length(); ++i)
-		if (c_pszQuery[i] == '?')
-			++iParamCount;
-
-	if (iParamCount)
-	{
-		m_vec_param.resize(iParamCount);
-		memset(&m_vec_param[0], 0, sizeof(MYSQL_BIND) * iParamCount);
-
-		m_puiParamLen = (uint64_t *) calloc(iParamCount, sizeof(uint64_t));
-	}
-
-	m_vec_result.resize(48);
-	memset(&m_vec_result[0], 0, sizeof(MYSQL_BIND) * 48);
-
-	if (mysql_stmt_bind_result(m_pkStmt, &m_vec_result[0]))
-	{
-		Error("mysql_stmt_bind_result");
-		return 0;
-	}
-
-	return true;
-}
-
-bool CStmt::BindParam(enum_field_types type, void * p, int iMaxLen)
-{
-	if (m_uiParamCount >= m_vec_param.size())
-	{
-        SPDLOG_ERROR("too many parameter in query: {}", m_stQuery);
-		return false;
-	}
-
-	MYSQL_BIND * bind = &m_vec_param[m_uiParamCount];
-
-	bind->buffer_type	= type;
-	bind->buffer	= (void *) p;
-	bind->buffer_length	= iMaxLen;
-	bind->length	= m_puiParamLen + m_uiParamCount;
-
-	if (++m_uiParamCount == m_vec_param.size())
-	{
-		if (mysql_stmt_bind_param(m_pkStmt, &m_vec_param[0]))
-		{
-			Error("mysql_stmt_bind_param");
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool CStmt::BindResult(enum_field_types type, void * p, int iMaxLen)
-{
-	if (m_uiResultCount >= m_vec_result.size())
-	{
-        SPDLOG_ERROR("too many result in query: {}", m_stQuery);
-		return false;
-	}
-
-	MYSQL_BIND * bind = &m_vec_result[m_uiResultCount++];
-
-	bind->buffer_type	= type;
-	bind->buffer	= (void *) p;
-	bind->buffer_length	= iMaxLen;
-	return true;
-}
-
-int CStmt::Execute()
-{
-	if (m_uiParamCount != m_vec_param.size())
-	{
-        SPDLOG_ERROR("Parameter not enough {}, expected {} query: {}", m_uiParamCount, m_vec_param.size(), m_stQuery);
-		return 0;
-	}
-
-	for (unsigned int i = 0; i < m_uiParamCount; ++i)
-	{
-		MYSQL_BIND * bind = &m_vec_param[i];
-
-		if (bind->buffer_type == MYSQL_TYPE_STRING)
-		{
-			*(m_puiParamLen + i) = strlen((const char *) bind->buffer);
-			SPDLOG_TRACE("param {} len {} buf {}", i, *m_puiParamLen, (const char *) bind->buffer);
-		}
-	}
-
-	if (mysql_stmt_execute(m_pkStmt))
-	{
-		Error("mysql_stmt_execute");
-		return 0;
-	}
-
-	if (mysql_stmt_store_result(m_pkStmt))
-	{
-		Error("mysql_store_result");
-		return 0;
-	}
-
-	iRows = mysql_stmt_num_rows(m_pkStmt);
-	return true;
-}
-
-bool CStmt::Fetch()
-{
-	return !mysql_stmt_fetch(m_pkStmt);
-}
-

src/libsql/src/Tellwait.cpp

@@ -1,5 +1,3 @@
-#ifndef __WIN32__
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -82,6 +80,3 @@ void WAIT_CHILD(void)
 		exit(1);
 	}
 }
-
-#endif
-

src/libthecore/include/typedef.h

@@ -8,8 +8,6 @@ typedef uint8_t     UBYTE;
 typedef int8_t      sbyte;
 typedef uint16_t    sh_int;
 
-#ifndef __WIN32__
-
 typedef uint32_t    DWORD;
 typedef uint32_t    BOOL;
 typedef uint8_t     BYTE;
@@ -19,40 +17,4 @@ typedef uint32_t    ULONG;
 typedef int32_t     INT;
 typedef uint32_t    UINT;
 
-#else
-
-struct timezone 
-{
-    int     tz_minuteswest; /* minutes west of Greenwich */
-    int     tz_dsttime;     /* type of dst correction */
-};
-
-typedef SOCKET			socket_t;
-
-#if !defined(_W64)
-#if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#define _W64 __w64
-#else
-#define _W64
-#endif
-#endif
-
-#ifdef _WIN64
-typedef __int64 ssize_t;
-#else
-typedef _W64 int ssize_t;
-#endif
-
-// Fixed-size integer types
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#endif
-
-typedef unsigned int uint;
-
-#endif
-
 #endif // __INC_LIBTHECORE_TYPEDEF_H__

src/libthecore/include/utils.h

@@ -120,8 +120,4 @@ extern "C++"
 #endif
 #endif
 
-#ifdef __WIN32__
-extern void gettimeofday(struct timeval* t, struct timezone* dummy);
-#endif
-
 #endif	// __INC_UTILS_H__

src/libthecore/src/main.cpp

@@ -15,12 +15,7 @@ unsigned int	thecore_profiler[NUM_PF];
 
 int thecore_init(int fps, HEARTFUNC heartbeat_func)
 {
-#if defined(__WIN32__) || defined(__linux__)
     srand(time(0));
-#else
-    srandom(time(0) + getpid() + getuid());
-    srandomdev();
-#endif
     signal_setup();
 
 	thecore_heart = heart_new(1000000 / fps, heartbeat_func);

src/libthecore/src/signals.cpp

@@ -7,85 +7,6 @@
 #define __LIBTHECORE__
 #include "stdafx.h"
 
-#if defined(__WIN32__) || defined(__linux__)
 void signal_setup() {}
 void signal_timer_disable() {}
 void signal_timer_enable(int timeout_seconds) {}
-#elif __FreeBSD__
-#define RETSIGTYPE void
-
-RETSIGTYPE reap(int sig)
-{
-    while (waitpid(-1, NULL, WNOHANG) > 0);
-    signal(SIGCHLD, reap);
-}
-
-
-RETSIGTYPE checkpointing(int sig)
-{
-    if (!tics)
-    {
-	sys_err("CHECKPOINT shutdown: tics did not updated.");
-	abort();
-    }
-    else
-	tics = 0;
-}
-
-
-RETSIGTYPE hupsig(int sig)
-{
-    shutdowned = true;
-    sys_err("SIGHUP, SIGINT, SIGTERM signal has been received. shutting down.");
-}
-
-RETSIGTYPE usrsig(int sig)
-{
-    core_dump();
-}
-
-void signal_timer_disable(void)
-{
-    struct itimerval itime;
-    struct timeval interval;
-
-    interval.tv_sec	= 0;
-    interval.tv_usec	= 0;
-
-    itime.it_interval = interval;
-    itime.it_value = interval;
-
-    setitimer(ITIMER_VIRTUAL, &itime, NULL);
-}
-
-void signal_timer_enable(int sec)
-{
-    struct itimerval itime;
-    struct timeval interval;
-
-    interval.tv_sec	= sec;
-    interval.tv_usec	= 0;
-
-    itime.it_interval = interval;
-    itime.it_value = interval;
-
-    setitimer(ITIMER_VIRTUAL, &itime, NULL);
-}
-
-void signal_setup(void)
-{
-    signal_timer_enable(30);
-
-    signal(SIGVTALRM, checkpointing);
-
-    /* just to be on the safe side: */
-    signal(SIGHUP, hupsig);
-    signal(SIGCHLD, reap);
-    signal(SIGINT, hupsig);
-    signal(SIGTERM, hupsig);
-    signal(SIGPIPE, SIG_IGN);
-    signal(SIGALRM, SIG_IGN);
-    signal(SIGUSR1, usrsig);
-}
-
-#endif

src/libthecore/src/utils.cpp

@@ -210,7 +210,6 @@ struct tm * tm_calc(const struct tm * curr_tm, int days)
     return (&new_tm);
 }
 
-#ifndef __WIN32__
 void thecore_sleep(struct timeval* timeout)
 {
     if (select(0, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, timeout) < 0)
@@ -251,32 +250,6 @@ uint64_t rdtsc()
 }
 */
 
-#else
-
-void thecore_sleep(struct timeval* timeout)
-{
-    Sleep(timeout->tv_sec * 1000 + timeout->tv_usec / 1000);
-}
-
-void thecore_msleep(DWORD dwMillisecond)
-{
-    Sleep(dwMillisecond);
-}
-
-void gettimeofday(struct timeval* t, struct timezone* dummy)
-{
-    DWORD millisec = GetTickCount();
-
-    t->tv_sec = (millisec / 1000);
-    t->tv_usec = (millisec % 1000) * 1000;
-}
-
-void core_dump_unix(const char *who, WORD line)
-{   
-}
-
-#endif
-
 float get_float_time()
 {
     struct timeval tv;

src/quest/src/crc32.h

@@ -1,9 +1,7 @@
 #ifndef __INC_CRC32_H__
 #define __INC_CRC32_H__
 
-#ifndef __WIN32__
 #include <unistd.h>
-#endif
 
 typedef unsigned int crc_t;
 

vcpkg.json

@@ -0,0 +1,14 @@
+{
+  "dependencies": [
+    "cryptopp",
+    "effolkronium-random",
+    "libevent",
+    "lzo",
+    "fmt",
+    "spdlog",
+    "argon2",
+    "libpq",
+    "libpqxx"
+  ],
+  "builtin-baseline": "a9eee3b18df395dbb8be71a31bd78ea441056e42"
+}