From 93d8f2a0bec77c1650db5196469b11f8f783a769 Mon Sep 17 00:00:00 2001 From: WildEgo Date: Sat, 7 Jun 2025 20:38:53 +0100 Subject: [PATCH] fix: __INTELLISENSE__ version import (VSC). change: Format all /db files, db/Main, db/DBManager, db/Monarch. add: PgConnectionPool, PgAsyncQuery. --- .vscode/settings.json | 72 +- TODO.md | 28 +- src/db/src/Cache.cpp | 94 +- src/db/src/Cache.h | 18 +- src/db/src/ClientManager.cpp | 2087 +++++++++++++------------ src/db/src/ClientManager.h | 567 ++++--- src/db/src/ClientManagerBoot.cpp | 734 ++++----- src/db/src/ClientManagerEventFlag.cpp | 13 +- src/db/src/ClientManagerGuild.cpp | 150 +- src/db/src/ClientManagerHorseName.cpp | 7 +- src/db/src/ClientManagerLogin.cpp | 170 +- src/db/src/ClientManagerParty.cpp | 36 +- src/db/src/ClientManagerPlayer.cpp | 740 +++++---- src/db/src/Config.cpp | 80 +- src/db/src/Config.h | 40 +- src/db/src/CsvReader.cpp | 109 +- src/db/src/CsvReader.h | 127 +- src/db/src/DBManager.cpp | 288 ++-- src/db/src/DBManager.h | 105 +- src/db/src/GuildManager.cpp | 357 +++-- src/db/src/GuildManager.h | 212 +-- src/db/src/ItemAwardManager.cpp | 50 +- src/db/src/ItemAwardManager.h | 41 +- src/db/src/ItemIDRangeManager.cpp | 20 +- src/db/src/ItemIDRangeManager.h | 25 +- src/db/src/Lock.h | 20 +- src/db/src/LoginData.cpp | 15 +- src/db/src/LoginData.h | 68 +- src/db/src/Main.cpp | 137 +- src/db/src/Main.h | 6 +- src/db/src/Marriage.cpp | 77 +- src/db/src/Marriage.h | 68 +- src/db/src/Monarch.cpp | 263 ++-- src/db/src/Monarch.h | 84 +- src/db/src/MoneyLog.cpp | 24 +- src/db/src/MoneyLog.h | 4 +- src/db/src/Peer.cpp | 84 +- src/db/src/Peer.h | 78 +- src/db/src/PeerBase.cpp | 71 +- src/db/src/PeerBase.h | 37 +- src/db/src/PrivManager.cpp | 37 +- src/db/src/PrivManager.h | 84 +- src/db/src/ProtoReader.cpp | 816 +++++----- src/db/src/ProtoReader.h | 9 +- src/db/src/QID.h | 52 +- src/db/src/grid.cpp | 5 +- src/db/src/grid.h | 26 +- src/db/src/version.cpp | 8 +- src/game/src/main.cpp | 516 +++--- src/game/src/version.cpp | 8 +- src/libsql/include/PgAsyncQuery.h | 15 + src/libsql/include/PgConnectionPool.h | 175 +++ 52 files changed, 4633 insertions(+), 4324 deletions(-) create mode 100644 src/libsql/include/PgAsyncQuery.h create mode 100644 src/libsql/include/PgConnectionPool.h diff --git a/.vscode/settings.json b/.vscode/settings.json index 6585b68..b203ac2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,10 +13,78 @@ "xstring": "cpp", "xtree": "cpp", "xutility": "cpp", - "sstream": "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_MANIFEST_MODE=OFF", "-DVCPKG_APPLOCAL_DEPS=ON", diff --git a/TODO.md b/TODO.md index b860e2d..ed324d4 100644 --- a/TODO.md +++ b/TODO.md @@ -1,15 +1,17 @@ # The list + - [ ] Database initialization - - [ ] ClientManager - - [ ] ClientManagerBoot - - [ ] ClientManagerEventFlag - - [ ] ClientManagerGuild - - [ ] ClientManagerHorseName - - [ ] ClientManagerLogin - - [ ] ClientManagerPlayer - - [ ] DBManager - - [ ] GuildManager - - [ ] ItemAwardManager - - [ ] ItemIDRangeManager - - [ ] Marriage - - [ ] Monarch \ No newline at end of file + - [x] Main (Most important duh) + - [ ] ClientManager + - [ ] ClientManagerBoot + - [ ] ClientManagerEventFlag + - [ ] ClientManagerGuild + - [ ] ClientManagerHorseName + - [ ] ClientManagerLogin + - [ ] ClientManagerPlayer + - [x] DBManager + - [ ] GuildManager + - [ ] ItemAwardManager + - [ ] ItemIDRangeManager + - [ ] Marriage + - [x] Monarch diff --git a/src/db/src/Cache.cpp b/src/db/src/Cache.cpp index 9563392..21ba880 100644 --- a/src/db/src/Cache.cpp +++ b/src/db/src/Cache.cpp @@ -38,17 +38,17 @@ void CItemCache::Delete() if (m_data.vnum == 0) return; - //char szQuery[QUERY_MAX_LEN]; - //szQuery[QUERY_MAX_LEN] = '\0'; - SPDLOG_TRACE("ItemCache::Delete : DELETE {}", m_data.id); + // char szQuery[QUERY_MAX_LEN]; + // szQuery[QUERY_MAX_LEN] = '\0'; + SPDLOG_TRACE("ItemCache::Delete : DELETE {}", m_data.id); m_data.vnum = 0; m_bNeedQuery = true; m_lastUpdateTime = time(0); OnFlush(); - - //m_bNeedQuery = false; - //m_lastUpdateTime = time(0) - m_expireTime; // 바로 타임아웃 되도록 하자. + + // m_bNeedQuery = false; + // m_lastUpdateTime = time(0) - m_expireTime; // 바로 타임아웃 되도록 하자. } void CItemCache::OnFlush() @@ -59,7 +59,7 @@ void CItemCache::OnFlush() snprintf(szQuery, sizeof(szQuery), "DELETE FROM item%s WHERE id=%u", GetTablePostfix(), m_data.id); CDBManager::instance().ReturnQuery(szQuery, QID_ITEM_DESTROY, 0, NULL); - SPDLOG_TRACE("ItemCache::Flush : DELETE {} {}", m_data.id, szQuery); + SPDLOG_TRACE("ItemCache::Flush : DELETE {} {}", m_data.id, szQuery); } else { @@ -70,7 +70,7 @@ void CItemCache::OnFlush() memset(&alSockets, 0, sizeof(int) * ITEM_SOCKET_MAX_NUM); memset(&aAttr, 0, sizeof(TPlayerItemAttribute) * ITEM_ATTRIBUTE_MAX_NUM); - TPlayerItem * p = &m_data; + TPlayerItem *p = &m_data; if (memcmp(alSockets, p->alSockets, sizeof(int) * ITEM_SOCKET_MAX_NUM)) isSocket = true; @@ -85,51 +85,51 @@ void CItemCache::OnFlush() int iLen = snprintf(szColumns, sizeof(szColumns), "id, owner_id, window, pos, count, vnum"); int iValueLen = snprintf(szValues, sizeof(szValues), "%u, %u, %d, %d, %u, %u", - p->id, p->owner, p->window, p->pos, p->count, p->vnum); + p->id, p->owner, p->window, p->pos, p->count, p->vnum); int iUpdateLen = snprintf(szUpdate, sizeof(szUpdate), "owner_id=%u, window=%d, pos=%d, count=%u, vnum=%u", - p->owner, p->window, p->pos, p->count, p->vnum); + p->owner, p->window, p->pos, p->count, p->vnum); if (isSocket) { iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, ", socket0, socket1, socket2"); iValueLen += snprintf(szValues + iValueLen, sizeof(szValues) - iValueLen, - ", %d, %d, %d", p->alSockets[0], p->alSockets[1], p->alSockets[2]); + ", %d, %d, %d", p->alSockets[0], p->alSockets[1], p->alSockets[2]); iUpdateLen += snprintf(szUpdate + iUpdateLen, sizeof(szUpdate) - iUpdateLen, - ", socket0=%d, socket1=%d, socket2=%d", p->alSockets[0], p->alSockets[1], p->alSockets[2]); + ", socket0=%d, socket1=%d, socket2=%d", p->alSockets[0], p->alSockets[1], p->alSockets[2]); } if (isAttr) { - iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, - ", attrtype0, attrvalue0, attrtype1, attrvalue1, attrtype2, attrvalue2, attrtype3, attrvalue3" - ", attrtype4, attrvalue4, attrtype5, attrvalue5, attrtype6, attrvalue6"); + iLen += snprintf(szColumns + iLen, sizeof(szColumns) - iLen, + ", attrtype0, attrvalue0, attrtype1, attrvalue1, attrtype2, attrvalue2, attrtype3, attrvalue3" + ", attrtype4, attrvalue4, attrtype5, attrvalue5, attrtype6, attrvalue6"); iValueLen += snprintf(szValues + iValueLen, sizeof(szValues) - iValueLen, - ", %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d", - p->aAttr[0].bType, p->aAttr[0].sValue, - p->aAttr[1].bType, p->aAttr[1].sValue, - p->aAttr[2].bType, p->aAttr[2].sValue, - p->aAttr[3].bType, p->aAttr[3].sValue, - p->aAttr[4].bType, p->aAttr[4].sValue, - p->aAttr[5].bType, p->aAttr[5].sValue, - p->aAttr[6].bType, p->aAttr[6].sValue); + ", %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d", + p->aAttr[0].bType, p->aAttr[0].sValue, + p->aAttr[1].bType, p->aAttr[1].sValue, + p->aAttr[2].bType, p->aAttr[2].sValue, + p->aAttr[3].bType, p->aAttr[3].sValue, + p->aAttr[4].bType, p->aAttr[4].sValue, + p->aAttr[5].bType, p->aAttr[5].sValue, + p->aAttr[6].bType, p->aAttr[6].sValue); iUpdateLen += snprintf(szUpdate + iUpdateLen, sizeof(szUpdate) - iUpdateLen, - ", attrtype0=%d, attrvalue0=%d" - ", attrtype1=%d, attrvalue1=%d" - ", attrtype2=%d, attrvalue2=%d" - ", attrtype3=%d, attrvalue3=%d" - ", attrtype4=%d, attrvalue4=%d" - ", attrtype5=%d, attrvalue5=%d" - ", attrtype6=%d, attrvalue6=%d", - p->aAttr[0].bType, p->aAttr[0].sValue, - p->aAttr[1].bType, p->aAttr[1].sValue, - p->aAttr[2].bType, p->aAttr[2].sValue, - p->aAttr[3].bType, p->aAttr[3].sValue, - p->aAttr[4].bType, p->aAttr[4].sValue, - p->aAttr[5].bType, p->aAttr[5].sValue, - p->aAttr[6].bType, p->aAttr[6].sValue); + ", attrtype0=%d, attrvalue0=%d" + ", attrtype1=%d, attrvalue1=%d" + ", attrtype2=%d, attrvalue2=%d" + ", attrtype3=%d, attrvalue3=%d" + ", attrtype4=%d, attrvalue4=%d" + ", attrtype5=%d, attrvalue5=%d" + ", attrtype6=%d, attrvalue6=%d", + p->aAttr[0].bType, p->aAttr[0].sValue, + p->aAttr[1].bType, p->aAttr[1].sValue, + p->aAttr[2].bType, p->aAttr[2].sValue, + p->aAttr[3].bType, p->aAttr[3].sValue, + p->aAttr[4].bType, p->aAttr[4].sValue, + p->aAttr[5].bType, p->aAttr[5].sValue, + p->aAttr[6].bType, p->aAttr[6].sValue); } char szItemQuery[QUERY_MAX_LEN + QUERY_MAX_LEN + 100]; @@ -139,7 +139,7 @@ void CItemCache::OnFlush() CDBManager::instance().ReturnQuery(szItemQuery, QID_ITEM_SAVE, 0, NULL); - //g_item_info.Add(p->vnum); + // g_item_info.Add(p->vnum); ++g_item_count; } @@ -179,7 +179,7 @@ CItemPriceListTableCache::CItemPriceListTableCache() m_expireTime = std::min(s_nMinFlushSec, g_iItemPriceListTableCacheFlushSeconds); } -void CItemPriceListTableCache::UpdateList(const TItemPriceListTable* pUpdateList) +void CItemPriceListTableCache::UpdateList(const TItemPriceListTable *pUpdateList) { // // 이미 캐싱된 아이템과 중복된 아이템을 찾고 중복되지 않는 이전 정보는 tmpvec 에 넣는다. @@ -189,7 +189,7 @@ void CItemPriceListTableCache::UpdateList(const TItemPriceListTable* pUpdateList for (uint idx = 0; idx < m_data.byCount; ++idx) { - const TItemPriceInfo* pos = pUpdateList->aPriceInfo; + const TItemPriceInfo *pos = pUpdateList->aPriceInfo; for (; pos != pUpdateList->aPriceInfo + pUpdateList->byCount && m_data.aPriceInfo[idx].dwVnum != pos->dwVnum; ++pos) ; @@ -199,7 +199,7 @@ void CItemPriceListTableCache::UpdateList(const TItemPriceListTable* pUpdateList // // pUpdateList 를 m_data 에 복사하고 남은 공간을 tmpvec 의 앞에서 부터 남은 만큼 복사한다. - // + // if (pUpdateList->byCount > SHOP_PRICELIST_MAX_NUM) { @@ -211,7 +211,7 @@ void CItemPriceListTableCache::UpdateList(const TItemPriceListTable* pUpdateList memcpy(m_data.aPriceInfo, pUpdateList->aPriceInfo, sizeof(TItemPriceInfo) * pUpdateList->byCount); - int nDeletedNum; // 삭제된 가격정보의 갯수 + int nDeletedNum; // 삭제된 가격정보의 갯수 if (pUpdateList->byCount < SHOP_PRICELIST_MAX_NUM) { @@ -231,8 +231,8 @@ void CItemPriceListTableCache::UpdateList(const TItemPriceListTable* pUpdateList m_bNeedQuery = true; SPDLOG_DEBUG( - "ItemPriceListTableCache::UpdateList : OwnerID[{}] Update [{}] Items, Delete [{}] Items, Total [{}] Items", - m_data.dwOwnerID, pUpdateList->byCount, nDeletedNum, m_data.byCount); + "ItemPriceListTableCache::UpdateList : OwnerID[{}] Update [{}] Items, Delete [{}] Items, Total [{}] Items", + m_data.dwOwnerID, pUpdateList->byCount, nDeletedNum, m_data.byCount); } void CItemPriceListTableCache::OnFlush() @@ -253,13 +253,13 @@ void CItemPriceListTableCache::OnFlush() for (int idx = 0; idx < m_data.byCount; ++idx) { snprintf(szQuery, sizeof(szQuery), - "INSERT INTO myshop_pricelist%s(owner_id, item_vnum, price) VALUES(%u, %u, %u)", - GetTablePostfix(), m_data.dwOwnerID, m_data.aPriceInfo[idx].dwVnum, m_data.aPriceInfo[idx].dwPrice); + "INSERT INTO myshop_pricelist%s(owner_id, item_vnum, price) VALUES(%u, %u, %u)", + GetTablePostfix(), m_data.dwOwnerID, m_data.aPriceInfo[idx].dwVnum, m_data.aPriceInfo[idx].dwPrice); CDBManager::instance().ReturnQuery(szQuery, QID_ITEMPRICE_SAVE, 0, NULL); } SPDLOG_DEBUG("ItemPriceListTableCache::Flush : OwnerID[{}] Update [{}]Items", m_data.dwOwnerID, m_data.byCount); - + m_bNeedQuery = false; } // END_OF_MYSHOP_PRICE_LIST diff --git a/src/db/src/Cache.h b/src/db/src/Cache.h index 16f5277..bc69dde 100644 --- a/src/db/src/Cache.h +++ b/src/db/src/Cache.h @@ -6,7 +6,7 @@ class CItemCache : public cache { - public: +public: CItemCache(); virtual ~CItemCache(); @@ -16,7 +16,7 @@ class CItemCache : public cache class CPlayerTableCache : public cache { - public: +public: CPlayerTableCache(); virtual ~CPlayerTableCache(); @@ -31,10 +31,9 @@ class CPlayerTableCache : public cache * @brief 개인상점의 아이템 가격정보 리스트에 대한 캐시 class * @version 05/06/10 Bang2ni - First release. */ -class CItemPriceListTableCache : public cache< TItemPriceListTable > +class CItemPriceListTableCache : public cache { - public: - +public: /// Constructor /** * 캐시 만료 시간을 설정한다. @@ -48,14 +47,13 @@ class CItemPriceListTableCache : public cache< TItemPriceListTable > * 캐시된 가격정보를 갱신한다. * 가격정보 리스트가 가득 찼을 경우 기존에 캐싱된 정보들을 뒤에서 부터 삭제한다. */ - void UpdateList(const TItemPriceListTable* pUpdateList); + void UpdateList(const TItemPriceListTable *pUpdateList); /// 가격정보를 DB 에 기록한다. - virtual void OnFlush(void); + virtual void OnFlush(void); - private: - - static const int s_nMinFlushSec; ///< Minimum cache expire time +private: + static const int s_nMinFlushSec; ///< Minimum cache expire time }; // END_OF_MYSHOP_PRICE_LIST #endif diff --git a/src/db/src/ClientManager.cpp b/src/db/src/ClientManager.cpp index b5227c5..9b39058 100644 --- a/src/db/src/ClientManager.cpp +++ b/src/db/src/ClientManager.cpp @@ -23,7 +23,7 @@ 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 * pVec, DWORD dwPID); +bool CreateItemTableFromRes(MYSQL_RES *res, std::vector *pVec, DWORD dwPID); DWORD g_dwUsageMax = 0; DWORD g_dwUsageAvg = 0; @@ -35,80 +35,83 @@ int g_item_count = 0; int g_query_count[2]; static void AcceptConnection( - evconnlistener* listener, - evutil_socket_t fd, - sockaddr* address, - int socklen, - void* ctx) + evconnlistener *listener, + evutil_socket_t fd, + sockaddr *address, + int socklen, + void *ctx) { - // We got a new connection! We have to create a new peer. - auto* clientManager = (CClientManager*) ctx; + // We got a new connection! We have to create a new peer. + auto *clientManager = (CClientManager *)ctx; - // Create a new buffer for the peer - event_base *base = evconnlistener_get_base(listener); - bufferevent *bev = bufferevent_socket_new(base, fd, BEV_OPT_CLOSE_ON_FREE); + // Create a new buffer for the peer + event_base *base = evconnlistener_get_base(listener); + bufferevent *bev = bufferevent_socket_new(base, fd, BEV_OPT_CLOSE_ON_FREE); - // Create a new peer - CPeer* peer = clientManager->AddPeer(bev, address); + // Create a new peer + CPeer *peer = clientManager->AddPeer(bev, address); - // Set the event handlers for this peer - bufferevent_setcb(bev, DescReadHandler, DescWriteHandler, DescEventHandler, peer); + // Set the event handlers for this peer + bufferevent_setcb(bev, DescReadHandler, DescWriteHandler, DescEventHandler, peer); - // Enable the events - bufferevent_enable(bev, EV_READ|EV_WRITE); + // Enable the events + bufferevent_enable(bev, EV_READ | EV_WRITE); } -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)); +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)); - event_base_loopexit(base, nullptr); + event_base_loopexit(base, nullptr); } -static void DescReadHandler(bufferevent *bev, void *ctx) { - auto* peer = (CPeer*) ctx; +static void DescReadHandler(bufferevent *bev, void *ctx) +{ + auto *peer = (CPeer *)ctx; - if (peer == CClientManager::Instance().GetAuthPeer()) - SPDLOG_TRACE("AUTH_PEER_READ: size {}", peer->GetRecvLength()); + if (peer == CClientManager::Instance().GetAuthPeer()) + SPDLOG_TRACE("AUTH_PEER_READ: size {}", peer->GetRecvLength()); - CClientManager::Instance().ProcessPackets(peer); + CClientManager::Instance().ProcessPackets(peer); } -static void DescWriteHandler(bufferevent *bev, void *ctx) { - auto* peer = (CPeer*) 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()); + if (peer == CClientManager::Instance().GetAuthPeer()) + SPDLOG_TRACE("AUTH_PEER_WRITE: size {}", peer->GetSendLength()); } -static void DescEventHandler(bufferevent *bev, short events, void *ctx) { - auto* peer = (CPeer*) ctx; +static void DescEventHandler(bufferevent *bev, short events, void *ctx) +{ + auto *peer = (CPeer *)ctx; - if (events & BEV_EVENT_ERROR) - SPDLOG_ERROR("PEER libevent error, handle: {}", peer->GetHandle()); + if (events & BEV_EVENT_ERROR) + SPDLOG_ERROR("PEER libevent error, handle: {}", peer->GetHandle()); - if (events & BEV_EVENT_EOF) - SPDLOG_DEBUG("PEER disconnected: handle {}", peer->GetHandle()); + if (events & BEV_EVENT_EOF) + SPDLOG_DEBUG("PEER disconnected: handle {}", peer->GetHandle()); - // Either the socket was closed or an error occured, therefore we can disconnect this peer. - if (events & (BEV_EVENT_EOF | BEV_EVENT_ERROR)) - CClientManager::Instance().RemovePeer(peer); + // Either the socket was closed or an error occured, therefore we can disconnect this peer. + if (events & (BEV_EVENT_EOF | BEV_EVENT_ERROR)) + CClientManager::Instance().RemovePeer(peer); } -CClientManager::CClientManager() : - m_pkAuthPeer(NULL), - m_iPlayerIDStart(0), - m_iPlayerDeleteLevelLimit(0), - m_iPlayerDeleteLevelLimitLower(0), - m_bChinaEventServer(false), - m_iShopTableSize(0), - m_pShopTable(NULL), - m_iRefineTableSize(0), - m_pRefineTable(NULL), - m_bShutdowned(false), - m_iCacheFlushCount(0), - m_iCacheFlushCountLimit(200) +CClientManager::CClientManager() : m_pkAuthPeer(NULL), + m_iPlayerIDStart(0), + m_iPlayerDeleteLevelLimit(0), + m_iPlayerDeleteLevelLimitLower(0), + m_bChinaEventServer(false), + m_iShopTableSize(0), + m_pShopTable(NULL), + m_iRefineTableSize(0), + m_pRefineTable(NULL), + m_bShutdowned(false), + m_iCacheFlushCount(0), + m_iCacheFlushCountLimit(200) { m_itemRange.dwMin = 0; m_itemRange.dwMax = 0; @@ -131,43 +134,45 @@ void CClientManager::Destroy() { m_mChannelStatus.clear(); - // Close the peer connections and empty the peer list - for (auto &peer: m_peerList) + // Close the peer connections and empty the peer list + for (auto &peer : m_peerList) peer->Destroy(); m_peerList.clear(); - // Free the libevent resources - if (m_listener) { - evconnlistener_free(m_listener); - m_listener = nullptr; - } + // Free the libevent resources + if (m_listener) + { + evconnlistener_free(m_listener); + m_listener = nullptr; + } - if (m_base) { - event_base_free(m_base); - m_base = nullptr; - } + if (m_base) + { + event_base_free(m_base); + m_base = nullptr; + } } bool CClientManager::Initialize() { int tmpValue; - - //BOOT_LOCALIZATION + + // BOOT_LOCALIZATION if (!InitializeLocalization()) { SPDLOG_ERROR("Failed Localization Infomation so exit"); return false; } - - //END_BOOT_LOCALIZATION - //ITEM_UNIQUE_ID - + + // END_BOOT_LOCALIZATION + // ITEM_UNIQUE_ID + if (!InitializeNowItemID()) { SPDLOG_ERROR(" Item range Initialize Failed. Exit DBCache Server"); return false; } - //END_ITEM_UNIQUE_ID + // END_ITEM_UNIQUE_ID if (!InitializeTables()) { @@ -185,32 +190,33 @@ bool CClientManager::Initialize() if (!CConfig::instance().GetValue("BIND_IP", szBindIP, 128)) strlcpy(szBindIP, "0", sizeof(szBindIP)); - // Create a new libevent base and listen for new connections - m_base = event_base_new(); - if (!m_base) { - SPDLOG_ERROR("Libevent base initialization FAILED!"); - return false; - } + // Create a new libevent base and listen for new connections + m_base = event_base_new(); + if (!m_base) + { + SPDLOG_ERROR("Libevent base initialization FAILED!"); + return false; + } - sockaddr_in sin = {}; + sockaddr_in sin = {}; - /* This is an INET address */ - sin.sin_family = AF_INET; + /* This is an INET address */ + sin.sin_family = AF_INET; - sin.sin_addr.s_addr = inet_addr(szBindIP); - sin.sin_port = htons(tmpValue); + sin.sin_addr.s_addr = inet_addr(szBindIP); + sin.sin_port = htons(tmpValue); - m_listener = evconnlistener_new_bind( - m_base, - AcceptConnection, this, - LEV_OPT_CLOSE_ON_FREE|LEV_OPT_REUSEABLE, -1, - (const sockaddr*)&sin, sizeof(sin) - ); - if (!m_listener) { - SPDLOG_ERROR("Libevent listener initialization FAILED!"); - return false; - } - evconnlistener_set_error_cb(m_listener, AcceptError); + m_listener = evconnlistener_new_bind( + m_base, + AcceptConnection, this, + LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, -1, + (const sockaddr *)&sin, sizeof(sin)); + if (!m_listener) + { + SPDLOG_ERROR("Libevent listener initialization FAILED!"); + return false; + } + evconnlistener_set_error_cb(m_listener, AcceptError); if (!CConfig::instance().GetValue("BACKUP_LIMIT_SEC", &tmpValue)) tmpValue = 600; @@ -233,28 +239,27 @@ bool CClientManager::Initialize() m_bChinaEventServer = false; - int iChinaEventServer = 0; + int iChinaEventServer = 0; if (CConfig::instance().GetValue("CHINA_EVENT_SERVER", &iChinaEventServer)) m_bChinaEventServer = (iChinaEventServer); - SPDLOG_DEBUG("CHINA_EVENT_SERVER {}", CClientManager::instance().IsChinaEventServer()?"true":"false"); - + SPDLOG_DEBUG("CHINA_EVENT_SERVER {}", CClientManager::instance().IsChinaEventServer() ? "true" : "false"); LoadEventFlag(); // database character-set을 강제로 맞춤 if (g_stLocale == "big5" || g_stLocale == "sjis") - CDBManager::instance().QueryLocaleSet(); + CDBManager::instance().QueryLocaleSet(); return true; } void CClientManager::MainLoop() { - SQLMsg * tmp; + SQLMsg *tmp; - SPDLOG_DEBUG("ClientManager pointer is {}", (void*) this); + SPDLOG_DEBUG("ClientManager pointer is {}", (void *)this); // 메인루프 while (!m_bShutdowned) @@ -267,7 +272,7 @@ void CClientManager::MainLoop() if (!Process()) break; - } + } // // 메인루프 종료처리 @@ -278,22 +283,21 @@ void CClientManager::MainLoop() itertype(m_map_playerCache) it = m_map_playerCache.begin(); - //플레이어 테이블 캐쉬 플러쉬 + // 플레이어 테이블 캐쉬 플러쉬 while (it != m_map_playerCache.end()) { - CPlayerTableCache * c = (it++)->second; + CPlayerTableCache *c = (it++)->second; c->Flush(); delete c; } m_map_playerCache.clear(); - itertype(m_map_itemCache) it2 = m_map_itemCache.begin(); - //아이템 플러쉬 + // 아이템 플러쉬 while (it2 != m_map_itemCache.end()) { - CItemCache * c = (it2++)->second; + CItemCache *c = (it2++)->second; c->Flush(); delete c; @@ -306,7 +310,7 @@ void CClientManager::MainLoop() // for (itertype(m_mapItemPriceListCache) itPriceList = m_mapItemPriceListCache.begin(); itPriceList != m_mapItemPriceListCache.end(); ++itPriceList) { - CItemPriceListTableCache* pCache = itPriceList->second; + CItemPriceListTableCache *pCache = itPriceList->second; pCache->Flush(); delete pCache; } @@ -320,7 +324,7 @@ void CClientManager::Quit() m_bShutdowned = true; } -void CClientManager::QUERY_BOOT(CPeer* peer, TPacketGDBoot * p) +void CClientManager::QUERY_BOOT(CPeer *peer, TPacketGDBoot *p) { const BYTE bPacketVersion = 6; // BOOT 패킷이 바뀔때마다 번호를 올리도록 한다. @@ -328,11 +332,11 @@ void CClientManager::QUERY_BOOT(CPeer* peer, TPacketGDBoot * p) std::vector vHost; __GetHostInfo(vHost); - __GetAdminInfo(p->szIP, vAdmin); + __GetAdminInfo(p->szIP, vAdmin); SPDLOG_DEBUG("QUERY_BOOT : AdminInfo (Request ServerIp {}) ", p->szIP); - DWORD dwPacketSize = + DWORD dwPacketSize = sizeof(DWORD) + sizeof(BYTE) + sizeof(WORD) + sizeof(WORD) + sizeof(TMobTable) * m_vec_mobTable.size() + @@ -344,17 +348,17 @@ void CClientManager::QUERY_BOOT(CPeer* peer, TPacketGDBoot * p) sizeof(WORD) + sizeof(WORD) + sizeof(TItemAttrTable) * m_vec_itemRareTable.size() + sizeof(WORD) + sizeof(WORD) + sizeof(TBanwordTable) * m_vec_banwordTable.size() + sizeof(WORD) + sizeof(WORD) + sizeof(building::TLand) * m_vec_kLandTable.size() + - sizeof(WORD) + sizeof(WORD) + sizeof(building::TObjectProto) * m_vec_kObjectProto.size() + + sizeof(WORD) + sizeof(WORD) + sizeof(building::TObjectProto) * m_vec_kObjectProto.size() + sizeof(WORD) + sizeof(WORD) + sizeof(building::TObject) * m_map_pkObjectTable.size() + - sizeof(time_t) + - sizeof(WORD) + sizeof(WORD) + sizeof(TItemIDRangeTable)*2 + - //ADMIN_MANAGER + sizeof(time_t) + + sizeof(WORD) + sizeof(WORD) + sizeof(TItemIDRangeTable) * 2 + + // ADMIN_MANAGER sizeof(WORD) + sizeof(WORD) + 16 * vHost.size() + - sizeof(WORD) + sizeof(WORD) + sizeof(tAdminInfo) * vAdmin.size() + - //END_ADMIN_MANAGER - sizeof(WORD) + sizeof(WORD) + sizeof(TMonarchInfo) + - sizeof(WORD) + sizeof(WORD) + sizeof(MonarchCandidacy)* CMonarch::instance().MonarchCandidacySize() + - sizeof(WORD); + sizeof(WORD) + sizeof(WORD) + sizeof(tAdminInfo) * vAdmin.size() + + // END_ADMIN_MANAGER + sizeof(WORD) + sizeof(WORD) + sizeof(TMonarchInfo) + + sizeof(WORD) + sizeof(WORD) + sizeof(MonarchCandidacy) * CMonarch::instance().MonarchCandidacySize() + + sizeof(WORD); peer->EncodeHeader(HEADER_DG_BOOT, 0, dwPacketSize); peer->Encode(&dwPacketSize, sizeof(DWORD)); @@ -374,9 +378,9 @@ void CClientManager::QUERY_BOOT(CPeer* peer, TPacketGDBoot * p) SPDLOG_DEBUG("sizeof(TLand) = {}", sizeof(building::TLand)); SPDLOG_DEBUG("sizeof(TObjectProto) = {}", sizeof(building::TObjectProto)); SPDLOG_DEBUG("sizeof(TObject) = {}", sizeof(building::TObject)); - //ADMIN_MANAGER + // ADMIN_MANAGER SPDLOG_DEBUG("sizeof(tAdminInfo) = {} * {} ", sizeof(tAdminInfo) * vAdmin.size()); - //END_ADMIN_MANAGER + // END_ADMIN_MANAGER SPDLOG_DEBUG("sizeof(TMonarchInfo) = {} * {}", sizeof(TMonarchInfo)); peer->EncodeWORD(sizeof(TMobTable)); @@ -441,7 +445,7 @@ void CClientManager::QUERY_BOOT(CPeer* peer, TPacketGDBoot * p) peer->SetItemIDRange(itemRange); peer->SetSpareItemIDRange(itemRangeSpare); - //ADMIN_MANAGER + // ADMIN_MANAGER peer->EncodeWORD(16); peer->EncodeWORD(vHost.size()); @@ -459,31 +463,32 @@ void CClientManager::QUERY_BOOT(CPeer* peer, TPacketGDBoot * p) peer->Encode(&vAdmin[n], sizeof(tAdminInfo)); SPDLOG_DEBUG("Admin name {} ConntactIP {}", vAdmin[n].m_szName, vAdmin[n].m_szContactIP); } - //END_ADMIN_MANAGER + // END_ADMIN_MANAGER - //MONARCH + // MONARCH peer->EncodeWORD(sizeof(TMonarchInfo)); peer->EncodeWORD(1); peer->Encode(CMonarch::instance().GetMonarch(), sizeof(TMonarchInfo)); - CMonarch::VEC_MONARCHCANDIDACY & rVecMonarchCandidacy = CMonarch::instance().GetVecMonarchCandidacy(); - + CMonarch::VEC_MONARCHCANDIDACY &rVecMonarchCandidacy = CMonarch::instance().GetVecMonarchCandidacy(); + 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 + // END_MONARCE SPDLOG_TRACE("MONARCHCandidacy Size {}", CMonarch::instance().MonarchCandidacySize()); peer->EncodeWORD(0xffff); } -void CClientManager::SendPartyOnSetup(CPeer* pkPeer) +void CClientManager::SendPartyOnSetup(CPeer *pkPeer) { - TPartyMap & pm = m_map_pkChannelParty[pkPeer->GetChannel()]; + TPartyMap &pm = m_map_pkChannelParty[pkPeer->GetChannel()]; for (itertype(pm) it_party = pm.begin(); it_party != pm.end(); ++it_party) { @@ -507,12 +512,12 @@ void CClientManager::SendPartyOnSetup(CPeer* pkPeer) } } -void CClientManager::QUERY_PLAYER_COUNT(CPeer * pkPeer, TPlayerCountPacket * pPacket) +void CClientManager::QUERY_PLAYER_COUNT(CPeer *pkPeer, TPlayerCountPacket *pPacket) { pkPeer->SetUserCount(pPacket->dwCount); } -void CClientManager::QUERY_QUEST_SAVE(CPeer * pkPeer, TQuestTable * pTable, DWORD dwLen) +void CClientManager::QUERY_QUEST_SAVE(CPeer *pkPeer, TQuestTable *pTable, DWORD dwLen) { if (0 != (dwLen % sizeof(TQuestTable))) { @@ -529,23 +534,23 @@ void CClientManager::QUERY_QUEST_SAVE(CPeer * pkPeer, TQuestTable * pTable, DWOR if (pTable->lValue == 0) { snprintf(szQuery, sizeof(szQuery), - "DELETE FROM quest%s WHERE dwPID=%d AND szName='%s' AND szState='%s'", - GetTablePostfix(), pTable->dwPID, pTable->szName, pTable->szState); + "DELETE FROM quest%s WHERE dwPID=%d AND szName='%s' AND szState='%s'", + GetTablePostfix(), pTable->dwPID, pTable->szName, pTable->szState); } else { 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); + "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); } } -void CClientManager::QUERY_SAFEBOX_LOAD(CPeer * pkPeer, DWORD dwHandle, TSafeboxLoadPacket * packet, bool bMall) +void CClientManager::QUERY_SAFEBOX_LOAD(CPeer *pkPeer, DWORD dwHandle, TSafeboxLoadPacket *packet, bool bMall) { - ClientHandleInfo * pi = new ClientHandleInfo(dwHandle); + ClientHandleInfo *pi = new ClientHandleInfo(dwHandle); strlcpy(pi->safebox_password, packet->szPassword, sizeof(pi->safebox_password)); pi->account_id = packet->dwID; pi->account_index = 0; @@ -554,18 +559,18 @@ void CClientManager::QUERY_SAFEBOX_LOAD(CPeer * pkPeer, DWORD dwHandle, TSafebox char szQuery[QUERY_MAX_LEN]; snprintf(szQuery, sizeof(szQuery), - "SELECT account_id, size, password FROM safebox%s WHERE account_id=%u", - GetTablePostfix(), packet->dwID); + "SELECT account_id, size, password FROM safebox%s WHERE account_id=%u", + GetTablePostfix(), packet->dwID); - SPDLOG_TRACE("HEADER_GD_SAFEBOX_LOAD (handle: {} account.id {} is_mall {})", dwHandle, packet->dwID, bMall ? 1 : 0); + SPDLOG_TRACE("HEADER_GD_SAFEBOX_LOAD (handle: {} account.id {} is_mall {})", dwHandle, packet->dwID, bMall ? 1 : 0); CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_LOAD, pkPeer->GetHandle(), pi); } -void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) +void CClientManager::RESULT_SAFEBOX_LOAD(CPeer *pkPeer, SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - ClientHandleInfo * pi = (ClientHandleInfo *) qi->pvData; + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + ClientHandleInfo *pi = (ClientHandleInfo *)qi->pvData; DWORD dwHandle = pi->dwHandle; // 여기에서 사용하는 account_index는 쿼리 순서를 말한다. @@ -577,10 +582,10 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) char szSafeboxPassword[SAFEBOX_PASSWORD_MAX_LEN + 1]; strlcpy(szSafeboxPassword, pi->safebox_password, sizeof(szSafeboxPassword)); - TSafeboxTable * pSafebox = new TSafeboxTable; + TSafeboxTable *pSafebox = new TSafeboxTable; memset(pSafebox, 0, sizeof(TSafeboxTable)); - SQLResult * res = msg->Get(); + SQLResult *res = msg->Get(); if (res->uiNumRows == 0) { @@ -634,17 +639,17 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) 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"); + 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; @@ -660,7 +665,6 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) return; } - // 쿼리에 에러가 있었으므로 응답할 경우 창고가 비어있는 것 처럼 // 보이기 때문에 창고가 아얘 안열리는게 나음 if (!msg->Get()->pSQLResult) @@ -673,7 +677,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) static std::vector s_items; CreateItemTableFromRes(msg->Get()->pSQLResult, &s_items, pi->account_id); - std::set * pSet = ItemAwardManager::instance().GetByLogin(pi->login); + std::set *pSet = ItemAwardManager::instance().GetByLogin(pi->login); if (pSet && !m_vec_itemTable.empty()) { @@ -683,7 +687,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) for (DWORD i = 0; i < s_items.size(); ++i) { - TPlayerItem & r = s_items[i]; + TPlayerItem &r = s_items[i]; itertype(m_map_itemTableByVnum) it = m_map_itemTableByVnum.find(r.vnum); @@ -699,7 +703,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) if (!bEscape) { - std::vector > vec_dwFinishedAwardID; + std::vector> vec_dwFinishedAwardID; typeof(pSet->begin()) it = pSet->begin(); @@ -707,8 +711,8 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) while (it != pSet->end()) { - TItemAward * pItemAward = *(it++); - const DWORD& dwItemVnum = pItemAward->dwVnum; + TItemAward *pItemAward = *(it++); + const DWORD &dwItemVnum = pItemAward->dwVnum; if (pItemAward->bTaken) continue; @@ -727,7 +731,7 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) continue; } - TItemTable * pItemTable = it->second; + TItemTable *pItemTable = it->second; int iPos; @@ -769,38 +773,48 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) { switch (dwItemVnum) { - case 72723: case 72724: case 72725: case 72726: - case 72727: case 72728: case 72729: case 72730: - // 무시무시하지만 이전에 하던 걸 고치기는 무섭고... - // 그래서 그냥 하드 코딩. 선물 상자용 자동물약 아이템들. - case 76004: case 76005: case 76021: case 76022: - case 79012: case 79013: - if (pItemAward->dwSocket2 == 0) - { - dwSocket2 = pItemTable->alValues[0]; - } - else - { - dwSocket2 = pItemAward->dwSocket2; - } - break; + case 72723: + case 72724: + case 72725: + case 72726: + case 72727: + case 72728: + case 72729: + case 72730: + // 무시무시하지만 이전에 하던 걸 고치기는 무섭고... + // 그래서 그냥 하드 코딩. 선물 상자용 자동물약 아이템들. + case 76004: + case 76005: + case 76021: + case 76022: + case 79012: + case 79013: + if (pItemAward->dwSocket2 == 0) + { + dwSocket2 = pItemTable->alValues[0]; + } + else + { + dwSocket2 = pItemAward->dwSocket2; + } + break; } } - if (GetItemID () > m_itemRange.dwMax) + if (GetItemID() > m_itemRange.dwMax) { SPDLOG_ERROR("UNIQUE ID OVERFLOW!!"); break; } { - itertype(m_map_itemTableByVnum) it = m_map_itemTableByVnum.find (dwItemVnum); + 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; + 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); @@ -831,19 +845,19 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) } } - snprintf(szQuery, sizeof(szQuery), - "INSERT INTO item%s (id, owner_id, window, pos, vnum, count, socket0, socket1, socket2) " - "VALUES(%u, %u, '%s', %d, %u, %u, %u, %u, %u)", - GetTablePostfix(), - GainItemID(), - pi->account_id, - pi->ip[0] == 0 ? "SAFEBOX" : "MALL", - iPos, - pItemAward->dwVnum, pItemAward->dwCount, pItemAward->dwSocket0, pItemAward->dwSocket1, dwSocket2); + snprintf(szQuery, sizeof(szQuery), + "INSERT INTO item%s (id, owner_id, window, pos, vnum, count, socket0, socket1, socket2) " + "VALUES(%u, %u, '%s', %d, %u, %u, %u, %u, %u)", + GetTablePostfix(), + GainItemID(), + pi->account_id, + pi->ip[0] == 0 ? "SAFEBOX" : "MALL", + iPos, + pItemAward->dwVnum, pItemAward->dwCount, pItemAward->dwSocket0, pItemAward->dwSocket1, dwSocket2); } std::unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult * pRes = pmsg->Get(); + SQLResult *pRes = pmsg->Get(); SPDLOG_DEBUG("SAFEBOX Query : [{}]", szQuery); if (pRes->uiAffectedRows == 0 || pRes->uiInsertID == 0 || pRes->uiAffectedRows == (uint32_t)-1) @@ -881,10 +895,10 @@ void CClientManager::RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg) } } -void CClientManager::QUERY_SAFEBOX_CHANGE_SIZE(CPeer * pkPeer, DWORD dwHandle, TSafeboxChangeSizePacket * p) +void CClientManager::QUERY_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangeSizePacket *p) { - ClientHandleInfo * pi = new ClientHandleInfo(dwHandle); - pi->account_index = p->bSize; // account_index를 사이즈로 임시로 사용 + ClientHandleInfo *pi = new ClientHandleInfo(dwHandle); + pi->account_index = p->bSize; // account_index를 사이즈로 임시로 사용 char szQuery[QUERY_MAX_LEN]; @@ -896,10 +910,10 @@ void CClientManager::QUERY_SAFEBOX_CHANGE_SIZE(CPeer * pkPeer, DWORD dwHandle, T CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_CHANGE_SIZE, pkPeer->GetHandle(), pi); } -void CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(CPeer * pkPeer, SQLMsg * msg) +void CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - ClientHandleInfo * p = (ClientHandleInfo *) qi->pvData; + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + ClientHandleInfo *p = (ClientHandleInfo *)qi->pvData; DWORD dwHandle = p->dwHandle; BYTE bSize = p->account_index; @@ -912,9 +926,9 @@ void CClientManager::RESULT_SAFEBOX_CHANGE_SIZE(CPeer * pkPeer, SQLMsg * msg) } } -void CClientManager::QUERY_SAFEBOX_CHANGE_PASSWORD(CPeer * pkPeer, DWORD dwHandle, TSafeboxChangePasswordPacket * p) +void CClientManager::QUERY_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangePasswordPacket *p) { - ClientHandleInfo * pi = new ClientHandleInfo(dwHandle); + ClientHandleInfo *pi = new ClientHandleInfo(dwHandle); strlcpy(pi->safebox_password, p->szNewPassword, sizeof(pi->safebox_password)); strlcpy(pi->login, p->szOldPassword, sizeof(pi->login)); pi->account_id = p->dwID; @@ -925,10 +939,10 @@ void CClientManager::QUERY_SAFEBOX_CHANGE_PASSWORD(CPeer * pkPeer, DWORD dwHandl CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_CHANGE_PASSWORD, pkPeer->GetHandle(), pi); } -void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer * pkPeer, SQLMsg * msg) +void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - ClientHandleInfo * p = (ClientHandleInfo *) qi->pvData; + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + ClientHandleInfo *p = (ClientHandleInfo *)qi->pvData; DWORD dwHandle = p->dwHandle; if (msg->Get()->uiNumRows > 0) @@ -955,10 +969,10 @@ void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer * pkPeer, SQLMsg * msg pkPeer->EncodeBYTE(0); } -void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer * pkPeer, SQLMsg * msg) +void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer *pkPeer, SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - ClientHandleInfo * p = (ClientHandleInfo *) qi->pvData; + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + ClientHandleInfo *p = (ClientHandleInfo *)qi->pvData; DWORD dwHandle = p->dwHandle; delete p; @@ -967,9 +981,9 @@ void CClientManager::RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer * pkPeer, SQLMs } // MYSHOP_PRICE_LIST -void CClientManager::RESULT_PRICELIST_LOAD(CPeer* peer, SQLMsg* pMsg) +void CClientManager::RESULT_PRICELIST_LOAD(CPeer *peer, SQLMsg *pMsg) { - TItemPricelistReqInfo* pReqInfo = (TItemPricelistReqInfo*)static_cast(pMsg->pvUserData)->pvData; + TItemPricelistReqInfo *pReqInfo = (TItemPricelistReqInfo *)static_cast(pMsg->pvUserData)->pvData; // // DB 에서 로드한 정보를 Cache 에 저장 @@ -978,7 +992,7 @@ void CClientManager::RESULT_PRICELIST_LOAD(CPeer* peer, SQLMsg* pMsg) TItemPriceListTable table; table.dwOwnerID = pReqInfo->second; table.byCount = 0; - + MYSQL_ROW row; while ((row = mysql_fetch_row(pMsg->Get()->pSQLResult))) @@ -1010,9 +1024,9 @@ void CClientManager::RESULT_PRICELIST_LOAD(CPeer* peer, SQLMsg* pMsg) delete pReqInfo; } -void CClientManager::RESULT_PRICELIST_LOAD_FOR_UPDATE(SQLMsg* pMsg) +void CClientManager::RESULT_PRICELIST_LOAD_FOR_UPDATE(SQLMsg *pMsg) { - TItemPriceListTable* pUpdateTable = (TItemPriceListTable*)static_cast(pMsg->pvUserData)->pvData; + TItemPriceListTable *pUpdateTable = (TItemPriceListTable *)static_cast(pMsg->pvUserData)->pvData; // // DB 에서 로드한 정보를 Cache 에 저장 @@ -1021,7 +1035,7 @@ void CClientManager::RESULT_PRICELIST_LOAD_FOR_UPDATE(SQLMsg* pMsg) TItemPriceListTable table; table.dwOwnerID = pUpdateTable->dwOwnerID; table.byCount = 0; - + MYSQL_ROW row; while ((row = mysql_fetch_row(pMsg->Get()->pSQLResult))) @@ -1040,18 +1054,18 @@ void CClientManager::RESULT_PRICELIST_LOAD_FOR_UPDATE(SQLMsg* pMsg) } // END_OF_MYSHOP_PRICE_LIST -void CClientManager::QUERY_SAFEBOX_SAVE(CPeer * pkPeer, TSafeboxTable * pTable) +void CClientManager::QUERY_SAFEBOX_SAVE(CPeer *pkPeer, TSafeboxTable *pTable) { char szQuery[QUERY_MAX_LEN]; snprintf(szQuery, sizeof(szQuery), - "UPDATE safebox%s SET gold='%u' WHERE account_id=%u", - GetTablePostfix(), pTable->dwGold, pTable->dwID); + "UPDATE safebox%s SET gold='%u' WHERE account_id=%u", + GetTablePostfix(), pTable->dwGold, pTable->dwID); CDBManager::instance().ReturnQuery(szQuery, QID_SAFEBOX_SAVE, pkPeer->GetHandle(), NULL); } -void CClientManager::QUERY_EMPIRE_SELECT(CPeer * pkPeer, DWORD dwHandle, TEmpireSelectPacket * p) +void CClientManager::QUERY_EMPIRE_SELECT(CPeer *pkPeer, DWORD dwHandle, TEmpireSelectPacket *p) { char szQuery[QUERY_MAX_LEN]; @@ -1061,11 +1075,11 @@ void CClientManager::QUERY_EMPIRE_SELECT(CPeer * pkPeer, DWORD dwHandle, TEmpire SPDLOG_DEBUG("EmpireSelect: {}", szQuery); { snprintf(szQuery, sizeof(szQuery), - "SELECT pid1, pid2, pid3, pid4 FROM player_index%s WHERE id=%u", GetTablePostfix(), p->dwAccountID); + "SELECT pid1, pid2, pid3, pid4 FROM player_index%s WHERE id=%u", GetTablePostfix(), p->dwAccountID); std::unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult * pRes = pmsg->Get(); + SQLResult *pRes = pmsg->Get(); if (pRes->uiNumRows) { @@ -1075,21 +1089,21 @@ void CClientManager::QUERY_EMPIRE_SELECT(CPeer * pkPeer, DWORD dwHandle, TEmpire DWORD pids[3]; UINT g_start_map[4] = - { - 0, // reserved - 1, // 신수국 - 21, // 천조국 - 41 // 진노국 - }; + { + 0, // reserved + 1, // 신수국 + 21, // 천조국 + 41 // 진노국 + }; // FIXME share with game - DWORD g_start_position[4][2]= - { - { 0, 0 }, - { 469300, 964200 }, // 신수국 - { 55700, 157900 }, // 천조국 - { 969600, 278400 } // 진노국 - }; + DWORD g_start_position[4][2] = + { + {0, 0}, + {469300, 964200}, // 신수국 + {55700, 157900}, // 천조국 + {969600, 278400} // 진노국 + }; for (int i = 0; i < 3; ++i) { @@ -1099,14 +1113,14 @@ void CClientManager::QUERY_EMPIRE_SELECT(CPeer * pkPeer, DWORD dwHandle, TEmpire if (pids[i]) { SPDLOG_DEBUG("EMPIRE move to pid[{}] to villiage of {}, map_index {}", - pids[i], p->bEmpire, g_start_map[p->bEmpire]); + pids[i], p->bEmpire, g_start_map[p->bEmpire]); - snprintf(szQuery, sizeof(szQuery), "UPDATE player%s SET map_index=%u,x=%u,y=%u WHERE id=%u", - GetTablePostfix(), - g_start_map[p->bEmpire], - g_start_position[p->bEmpire][0], - g_start_position[p->bEmpire][1], - pids[i]); + snprintf(szQuery, sizeof(szQuery), "UPDATE player%s SET map_index=%u,x=%u,y=%u WHERE id=%u", + GetTablePostfix(), + g_start_map[p->bEmpire], + g_start_position[p->bEmpire][0], + g_start_position[p->bEmpire][1], + pids[i]); std::unique_ptr pmsg2(CDBManager::instance().DirectQuery(szQuery)); } @@ -1118,23 +1132,23 @@ void CClientManager::QUERY_EMPIRE_SELECT(CPeer * pkPeer, DWORD dwHandle, TEmpire pkPeer->EncodeBYTE(p->bEmpire); } -void CClientManager::QUERY_SETUP(CPeer * peer, DWORD dwHandle, const char * c_pData) +void CClientManager::QUERY_SETUP(CPeer *peer, DWORD dwHandle, const char *c_pData) { - TPacketGDSetup * p = (TPacketGDSetup *) c_pData; + TPacketGDSetup *p = (TPacketGDSetup *)c_pData; c_pData += sizeof(TPacketGDSetup); if (p->bAuthServer) { - SPDLOG_DEBUG("AUTH_PEER ptr {}", (void*) peer); + SPDLOG_DEBUG("AUTH_PEER ptr {}", (void *)peer); m_pkAuthPeer = peer; return; } - peer->SetChannel(p->bChannel); + peer->SetChannel(p->bChannel); peer->SetPublicIP(p->szPublicIP); peer->SetListenPort(p->wListenPort); - peer->SetInternalIP(p->szInternalIP); + peer->SetInternalIP(p->szInternalIP); peer->SetP2PPort(p->wP2PPort); peer->SetMaps(p->alMaps); @@ -1155,7 +1169,7 @@ void CClientManager::QUERY_SETUP(CPeer * peer, DWORD dwHandle, const char * c_pD { for (itertype(m_peerList) i = m_peerList.begin(); i != m_peerList.end(); ++i) { - CPeer * tmp = *i; + CPeer *tmp = *i; if (tmp == peer) continue; @@ -1182,7 +1196,7 @@ void CClientManager::QUERY_SETUP(CPeer * peer, DWORD dwHandle, const char * c_pD { for (itertype(m_peerList) i = m_peerList.begin(); i != m_peerList.end(); ++i) { - CPeer * tmp = *i; + CPeer *tmp = *i; if (tmp == peer) continue; @@ -1209,7 +1223,7 @@ void CClientManager::QUERY_SETUP(CPeer * peer, DWORD dwHandle, const char * c_pD { for (itertype(m_peerList) i = m_peerList.begin(); i != m_peerList.end(); ++i) { - CPeer * tmp = *i; + CPeer *tmp = *i; if (tmp == peer) continue; @@ -1247,17 +1261,17 @@ void CClientManager::QUERY_SETUP(CPeer * peer, DWORD dwHandle, const char * c_pD // // 셋업 : 접속한 피어에 다른 피어들이 접속하게 만든다. (P2P 컨넥션 생성) - // + // SPDLOG_DEBUG("SETUP: channel {} listen {} p2p {} count {}", peer->GetChannel(), p->wListenPort, p->wP2PPort, bMapCount); TPacketDGP2P p2pSetupPacket; p2pSetupPacket.bChannel = peer->GetChannel(); strlcpy(p2pSetupPacket.szHost, peer->GetInternalIP(), sizeof(p2pSetupPacket.szHost)); - p2pSetupPacket.wPort = peer->GetP2PPort(); + p2pSetupPacket.wPort = peer->GetP2PPort(); - for (itertype(m_peerList) i = m_peerList.begin(); i != m_peerList.end();++i) + for (itertype(m_peerList) i = m_peerList.begin(); i != m_peerList.end(); ++i) { - CPeer * tmp = *i; + CPeer *tmp = *i; if (tmp == peer) continue; @@ -1273,17 +1287,17 @@ void CClientManager::QUERY_SETUP(CPeer * peer, DWORD dwHandle, const char * c_pD // // Log in the player // - TPacketLoginOnSetup * pck = (TPacketLoginOnSetup *) c_pData; + TPacketLoginOnSetup *pck = (TPacketLoginOnSetup *)c_pData; for (DWORD c = 0; c < p->dwLoginCount; ++c, ++pck) { - CLoginData * pkLD = new CLoginData; + CLoginData *pkLD = new CLoginData; pkLD->SetKey(pck->dwLoginKey); pkLD->SetClientKey(pck->adwClientKey); pkLD->SetIP(pck->szHost); - TAccountTable & r = pkLD->GetAccountRef(); + TAccountTable &r = pkLD->GetAccountRef(); r.id = pck->dwID; trim_and_lower(pck->szLogin, r.login, sizeof(r.login)); @@ -1308,28 +1322,28 @@ void CClientManager::QUERY_SETUP(CPeer * peer, DWORD dwHandle, const char * c_pD marriage::CManager::instance().OnSetup(peer); } -void CClientManager::QUERY_ITEM_FLUSH(CPeer * pkPeer, const char * c_pData) +void CClientManager::QUERY_ITEM_FLUSH(CPeer *pkPeer, const char *c_pData) { - DWORD dwID = *(DWORD *) c_pData; + DWORD dwID = *(DWORD *)c_pData; - SPDLOG_TRACE("HEADER_GD_ITEM_FLUSH: {}", dwID); + SPDLOG_TRACE("HEADER_GD_ITEM_FLUSH: {}", dwID); - CItemCache * c = GetItemCache(dwID); + CItemCache *c = GetItemCache(dwID); if (c) c->Flush(); } -void CClientManager::QUERY_ITEM_SAVE(CPeer * pkPeer, const char * c_pData) +void CClientManager::QUERY_ITEM_SAVE(CPeer *pkPeer, const char *c_pData) { - TPlayerItem * p = (TPlayerItem *) c_pData; + TPlayerItem *p = (TPlayerItem *)c_pData; // 창고면 캐쉬하지 않고, 캐쉬에 있던 것도 빼버려야 한다. // auction은 이 루트를 타지 않아야 한다. EnrollInAuction을 타야한다. if (p->window == SAFEBOX || p->window == MALL) { - CItemCache * c = GetItemCache(p->id); + CItemCache *c = GetItemCache(p->id); if (c) { @@ -1348,33 +1362,33 @@ void CClientManager::QUERY_ITEM_SAVE(CPeer * pkPeer, const char * c_pData) } char szQuery[512]; - snprintf(szQuery, sizeof(szQuery), - "REPLACE INTO item%s (id, owner_id, window, pos, count, vnum, socket0, socket1, socket2, " - "attrtype0, attrvalue0, " - "attrtype1, attrvalue1, " - "attrtype2, attrvalue2, " - "attrtype3, attrvalue3, " - "attrtype4, attrvalue4, " - "attrtype5, attrvalue5, " - "attrtype6, attrvalue6) " - "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, - p->owner, - p->window, - p->pos, - p->count, - p->vnum, - p->alSockets[0], - p->alSockets[1], - p->alSockets[2], - p->aAttr[0].bType, p->aAttr[0].sValue, - p->aAttr[1].bType, p->aAttr[1].sValue, - p->aAttr[2].bType, p->aAttr[2].sValue, - p->aAttr[3].bType, p->aAttr[3].sValue, - p->aAttr[4].bType, p->aAttr[4].sValue, - p->aAttr[5].bType, p->aAttr[5].sValue, - p->aAttr[6].bType, p->aAttr[6].sValue); + snprintf(szQuery, sizeof(szQuery), + "REPLACE INTO item%s (id, owner_id, window, pos, count, vnum, socket0, socket1, socket2, " + "attrtype0, attrvalue0, " + "attrtype1, attrvalue1, " + "attrtype2, attrvalue2, " + "attrtype3, attrvalue3, " + "attrtype4, attrvalue4, " + "attrtype5, attrvalue5, " + "attrtype6, attrvalue6) " + "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, + p->owner, + p->window, + p->pos, + p->count, + p->vnum, + p->alSockets[0], + p->alSockets[1], + p->alSockets[2], + p->aAttr[0].bType, p->aAttr[0].sValue, + p->aAttr[1].bType, p->aAttr[1].sValue, + p->aAttr[2].bType, p->aAttr[2].sValue, + p->aAttr[3].bType, p->aAttr[3].sValue, + p->aAttr[4].bType, p->aAttr[4].sValue, + p->aAttr[5].bType, p->aAttr[5].sValue, + p->aAttr[6].bType, p->aAttr[6].sValue); CDBManager::instance().ReturnQuery(szQuery, QID_ITEM_SAVE, pkPeer->GetHandle(), NULL); } @@ -1386,7 +1400,7 @@ void CClientManager::QUERY_ITEM_SAVE(CPeer * pkPeer, const char * c_pData) } } -CClientManager::TItemCacheSet * CClientManager::GetItemCacheSet(DWORD pid) +CClientManager::TItemCacheSet *CClientManager::GetItemCacheSet(DWORD pid) { TItemCacheSetPtrMap::iterator it = m_map_pkItemCacheSetPtr.find(pid); @@ -1401,10 +1415,10 @@ void CClientManager::CreateItemCacheSet(DWORD pid) if (m_map_pkItemCacheSetPtr.find(pid) != m_map_pkItemCacheSetPtr.end()) return; - TItemCacheSet * pSet = new TItemCacheSet; + TItemCacheSet *pSet = new TItemCacheSet; m_map_pkItemCacheSetPtr.insert(TItemCacheSetPtrMap::value_type(pid, pSet)); - SPDLOG_TRACE("ITEM_CACHE: new cache {}", pid); + SPDLOG_TRACE("ITEM_CACHE: new cache {}", pid); } void CClientManager::FlushItemCacheSet(DWORD pid) @@ -1417,12 +1431,12 @@ void CClientManager::FlushItemCacheSet(DWORD pid) return; } - TItemCacheSet * pSet = it->second; + TItemCacheSet *pSet = it->second; TItemCacheSet::iterator it_set = pSet->begin(); while (it_set != pSet->end()) { - CItemCache * c = *it_set++; + CItemCache *c = *it_set++; c->Flush(); m_map_itemCache.erase(c->Get()->id); @@ -1434,10 +1448,10 @@ void CClientManager::FlushItemCacheSet(DWORD pid) m_map_pkItemCacheSetPtr.erase(it); - SPDLOG_TRACE("FLUSH_ITEMCACHESET : Deleted pid({})", pid); + SPDLOG_TRACE("FLUSH_ITEMCACHESET : Deleted pid({})", pid); } -CItemCache * CClientManager::GetItemCache(DWORD id) +CItemCache *CClientManager::GetItemCache(DWORD id) { TItemCacheMap::iterator it = m_map_itemCache.find(id); @@ -1447,16 +1461,16 @@ CItemCache * CClientManager::GetItemCache(DWORD id) return it->second; } -void CClientManager::PutItemCache(TPlayerItem * pNew, bool bSkipQuery) -{ - CItemCache * c; +void CClientManager::PutItemCache(TPlayerItem *pNew, bool bSkipQuery) +{ + CItemCache *c; c = GetItemCache(pNew->id); - + // 아이템 새로 생성 if (!c) { - SPDLOG_TRACE("ITEM_CACHE: PutItemCache ==> New CItemCache id{} vnum{} new owner{}", pNew->id, pNew->vnum, pNew->owner); + SPDLOG_TRACE("ITEM_CACHE: PutItemCache ==> New CItemCache id{} vnum{} new owner{}", pNew->id, pNew->vnum, pNew->owner); c = new CItemCache; m_map_itemCache.insert(TItemCacheMap::value_type(pNew->id, c)); @@ -1464,7 +1478,7 @@ void CClientManager::PutItemCache(TPlayerItem * pNew, bool bSkipQuery) // 있을시 else { - SPDLOG_TRACE("ITEM_CACHE: PutItemCache ==> Have Cache"); + SPDLOG_TRACE("ITEM_CACHE: PutItemCache ==> Have Cache"); // 소유자가 틀리면 if (pNew->owner != c->Get()->owner) @@ -1474,27 +1488,27 @@ void CClientManager::PutItemCache(TPlayerItem * pNew, bool bSkipQuery) if (it != m_map_pkItemCacheSetPtr.end()) { - SPDLOG_TRACE("ITEM_CACHE: delete owner {} id {} new owner {}", c->Get()->owner, c->Get()->id, pNew->owner); + SPDLOG_TRACE("ITEM_CACHE: delete owner {} id {} new owner {}", c->Get()->owner, c->Get()->id, pNew->owner); it->second->erase(c); } } } - // 새로운 정보 업데이트 + // 새로운 정보 업데이트 c->Put(pNew, bSkipQuery); - + TItemCacheSetPtrMap::iterator it = m_map_pkItemCacheSetPtr.find(c->Get()->owner); if (it != m_map_pkItemCacheSetPtr.end()) { - SPDLOG_TRACE("ITEM_CACHE: save {} id {}", c->Get()->owner, c->Get()->id); + SPDLOG_TRACE("ITEM_CACHE: save {} id {}", c->Get()->owner, c->Get()->id); it->second->insert(c); } else { // 현재 소유자가 없으므로 바로 저장해야 다음 접속이 올 때 SQL에 쿼리하여 // 받을 수 있으므로 바로 저장한다. - SPDLOG_TRACE("ITEM_CACHE: direct save {} id {}", c->Get()->owner, c->Get()->id); + SPDLOG_TRACE("ITEM_CACHE: direct save {} id {}", c->Get()->owner, c->Get()->id); c->OnFlush(); } @@ -1502,7 +1516,7 @@ void CClientManager::PutItemCache(TPlayerItem * pNew, bool bSkipQuery) bool CClientManager::DeleteItemCache(DWORD dwID) { - CItemCache * c = GetItemCache(dwID); + CItemCache *c = GetItemCache(dwID); if (!c) return false; @@ -1512,7 +1526,7 @@ bool CClientManager::DeleteItemCache(DWORD dwID) } // MYSHOP_PRICE_LIST -CItemPriceListTableCache* CClientManager::GetItemPriceListCache(DWORD dwID) +CItemPriceListTableCache *CClientManager::GetItemPriceListCache(DWORD dwID) { TItemPriceListCacheMap::iterator it = m_mapItemPriceListCache.find(dwID); @@ -1522,9 +1536,9 @@ CItemPriceListTableCache* CClientManager::GetItemPriceListCache(DWORD dwID) return it->second; } -void CClientManager::PutItemPriceListCache(const TItemPriceListTable* pItemPriceList) +void CClientManager::PutItemPriceListCache(const TItemPriceListTable *pItemPriceList) { - CItemPriceListTableCache* pCache = GetItemPriceListCache(pItemPriceList->dwOwnerID); + CItemPriceListTableCache *pCache = GetItemPriceListCache(pItemPriceList->dwOwnerID); if (!pCache) { @@ -1532,7 +1546,7 @@ void CClientManager::PutItemPriceListCache(const TItemPriceListTable* pItemPrice m_mapItemPriceListCache.insert(TItemPriceListCacheMap::value_type(pItemPriceList->dwOwnerID, pCache)); } - pCache->Put(const_cast(pItemPriceList), true); + pCache->Put(const_cast(pItemPriceList), true); } void CClientManager::UpdatePlayerCache() @@ -1541,11 +1555,11 @@ void CClientManager::UpdatePlayerCache() while (it != m_map_playerCache.end()) { - CPlayerTableCache * c = (it++)->second; + CPlayerTableCache *c = (it++)->second; if (c->CheckTimeout()) { - SPDLOG_TRACE("UPDATE : UpdatePlayerCache() ==> FlushPlayerCache {} {} ", c->Get(false)->id, c->Get(false)->name); + SPDLOG_TRACE("UPDATE : UpdatePlayerCache() ==> FlushPlayerCache {} {} ", c->Get(false)->id, c->Get(false)->name); c->Flush(); @@ -1573,7 +1587,7 @@ void CClientManager::UpdateItemCache() while (it != m_map_itemCache.end()) { - CItemCache * c = (it++)->second; + CItemCache *c = (it++)->second; // 아이템은 Flush만 한다. if (c->CheckFlushTimeout()) @@ -1594,7 +1608,7 @@ void CClientManager::UpdateItemPriceListCache() while (it != m_mapItemPriceListCache.end()) { - CItemPriceListTableCache* pCache = it->second; + CItemPriceListTableCache *pCache = it->second; if (pCache->CheckFlushTimeout()) { @@ -1606,19 +1620,19 @@ void CClientManager::UpdateItemPriceListCache() } } -void CClientManager::QUERY_ITEM_DESTROY(CPeer * pkPeer, const char * c_pData) +void CClientManager::QUERY_ITEM_DESTROY(CPeer *pkPeer, const char *c_pData) { - DWORD dwID = *(DWORD *) c_pData; + DWORD dwID = *(DWORD *)c_pData; c_pData += sizeof(DWORD); - DWORD dwPID = *(DWORD *) c_pData; + DWORD dwPID = *(DWORD *)c_pData; if (!DeleteItemCache(dwID)) { char szQuery[64]; snprintf(szQuery, sizeof(szQuery), "DELETE FROM item%s WHERE id=%u", GetTablePostfix(), dwID); - SPDLOG_TRACE("HEADER_GD_ITEM_DESTROY: PID {} ID {}", dwPID, dwID); + SPDLOG_TRACE("HEADER_GD_ITEM_DESTROY: PID {} ID {}", dwPID, dwID); if (dwPID == 0) // 아무도 가진 사람이 없었다면, 비동기 쿼리 CDBManager::instance().AsyncQuery(szQuery); @@ -1627,11 +1641,11 @@ void CClientManager::QUERY_ITEM_DESTROY(CPeer * pkPeer, const char * c_pData) } } -void CClientManager::QUERY_FLUSH_CACHE(CPeer * pkPeer, const char * c_pData) +void CClientManager::QUERY_FLUSH_CACHE(CPeer *pkPeer, const char *c_pData) { - DWORD dwPID = *(DWORD *) c_pData; + DWORD dwPID = *(DWORD *)c_pData; - CPlayerTableCache * pkCache = GetPlayerCache(dwPID); + CPlayerTableCache *pkCache = GetPlayerCache(dwPID); if (!pkCache) return; @@ -1655,16 +1669,16 @@ void CClientManager::QUERY_RELOAD_PROTO() for (TPeerList::iterator i = m_peerList.begin(); i != m_peerList.end(); ++i) { - CPeer * tmp = *i; + CPeer *tmp = *i; if (!tmp->GetChannel()) continue; - tmp->EncodeHeader(HEADER_DG_RELOAD_PROTO, 0, - sizeof(WORD) + sizeof(TSkillTable) * m_vec_skillTable.size() + - sizeof(WORD) + sizeof(TBanwordTable) * m_vec_banwordTable.size() + - sizeof(WORD) + sizeof(TItemTable) * m_vec_itemTable.size() + - sizeof(WORD) + sizeof(TMobTable) * m_vec_mobTable.size()); + tmp->EncodeHeader(HEADER_DG_RELOAD_PROTO, 0, + sizeof(WORD) + sizeof(TSkillTable) * m_vec_skillTable.size() + + sizeof(WORD) + sizeof(TBanwordTable) * m_vec_banwordTable.size() + + sizeof(WORD) + sizeof(TItemTable) * m_vec_itemTable.size() + + sizeof(WORD) + sizeof(TMobTable) * m_vec_mobTable.size()); tmp->EncodeWORD(m_vec_skillTable.size()); tmp->Encode(&m_vec_skillTable[0], sizeof(TSkillTable) * m_vec_skillTable.size()); @@ -1684,28 +1698,28 @@ void CClientManager::QUERY_RELOAD_PROTO() /** * @version 05/06/08 Bang2ni - 지속시간 추가 */ -void CClientManager::AddGuildPriv(TPacketGiveGuildPriv* p) +void CClientManager::AddGuildPriv(TPacketGiveGuildPriv *p) { CPrivManager::instance().AddGuildPriv(p->guild_id, p->type, p->value, p->duration_sec); } -void CClientManager::AddEmpirePriv(TPacketGiveEmpirePriv* p) +void CClientManager::AddEmpirePriv(TPacketGiveEmpirePriv *p) { CPrivManager::instance().AddEmpirePriv(p->empire, p->type, p->value, p->duration_sec); } // END_OF_ADD_GUILD_PRIV_TIME -void CClientManager::AddCharacterPriv(TPacketGiveCharacterPriv* p) +void CClientManager::AddCharacterPriv(TPacketGiveCharacterPriv *p) { CPrivManager::instance().AddCharPriv(p->pid, p->type, p->value); } -void CClientManager::MoneyLog(TPacketMoneyLog* p) +void CClientManager::MoneyLog(TPacketMoneyLog *p) { CMoneyLog::instance().AddLog(p->type, p->vnum, p->gold); } -CLoginData * CClientManager::GetLoginData(DWORD dwKey) +CLoginData *CClientManager::GetLoginData(DWORD dwKey) { TLoginDataByLoginKey::iterator it = m_map_pkLoginData.find(dwKey); @@ -1715,7 +1729,7 @@ CLoginData * CClientManager::GetLoginData(DWORD dwKey) return it->second; } -CLoginData * CClientManager::GetLoginDataByLogin(const char * c_pszLogin) +CLoginData *CClientManager::GetLoginDataByLogin(const char *c_pszLogin) { char szLogin[LOGIN_MAX_LEN + 1]; trim_and_lower(c_pszLogin, szLogin, sizeof(szLogin)); @@ -1728,7 +1742,7 @@ CLoginData * CClientManager::GetLoginDataByLogin(const char * c_pszLogin) return it->second; } -CLoginData * CClientManager::GetLoginDataByAID(DWORD dwAID) +CLoginData *CClientManager::GetLoginDataByAID(DWORD dwAID) { TLoginDataByAID::iterator it = m_map_pkLoginDataByAID.find(dwAID); @@ -1738,7 +1752,7 @@ CLoginData * CClientManager::GetLoginDataByAID(DWORD dwAID) return it->second; } -void CClientManager::InsertLoginData(CLoginData * pkLD) +void CClientManager::InsertLoginData(CLoginData *pkLD) { char szLogin[LOGIN_MAX_LEN + 1]; trim_and_lower(pkLD->GetAccountRef().login, szLogin, sizeof(szLogin)); @@ -1748,7 +1762,7 @@ void CClientManager::InsertLoginData(CLoginData * pkLD) m_map_pkLoginDataByAID.insert(std::make_pair(pkLD->GetAccountRef().id, pkLD)); } -void CClientManager::DeleteLoginData(CLoginData * pkLD) +void CClientManager::DeleteLoginData(CLoginData *pkLD) { m_map_pkLoginData.erase(pkLD->GetKey()); m_map_pkLoginDataByLogin.erase(pkLD->GetAccountRef().login); @@ -1760,10 +1774,10 @@ void CClientManager::DeleteLoginData(CLoginData * pkLD) pkLD->SetDeleted(true); } -void CClientManager::QUERY_AUTH_LOGIN(CPeer * pkPeer, DWORD dwHandle, TPacketGDAuthLogin * p) +void CClientManager::QUERY_AUTH_LOGIN(CPeer *pkPeer, DWORD dwHandle, TPacketGDAuthLogin *p) { SPDLOG_TRACE("QUERY_AUTH_LOGIN {} {} {}", p->dwID, p->dwLoginKey, p->szLogin); - CLoginData * pkLD = GetLoginDataByLogin(p->szLogin); + CLoginData *pkLD = GetLoginDataByLogin(p->szLogin); if (pkLD) { @@ -1782,13 +1796,13 @@ void CClientManager::QUERY_AUTH_LOGIN(CPeer * pkPeer, DWORD dwHandle, TPacketGDA } else { - CLoginData * pkLD = new CLoginData; + CLoginData *pkLD = new CLoginData; pkLD->SetKey(p->dwLoginKey); pkLD->SetClientKey(p->adwClientKey); pkLD->SetPremium(p->iPremiumTimes); - TAccountTable & r = pkLD->GetAccountRef(); + TAccountTable &r = pkLD->GetAccountRef(); r.id = p->dwID; trim_and_lower(p->szLogin, r.login, sizeof(r.login)); @@ -1796,8 +1810,8 @@ void CClientManager::QUERY_AUTH_LOGIN(CPeer * pkPeer, DWORD dwHandle, TPacketGDA strlcpy(r.passwd, "TEMP", sizeof(r.passwd)); SPDLOG_DEBUG("AUTH_LOGIN id({}) login({}) social_id({}) login_key({}), client_key({} {} {} {})", - p->dwID, p->szLogin, p->szSocialID, p->dwLoginKey, - p->adwClientKey[0], p->adwClientKey[1], p->adwClientKey[2], p->adwClientKey[3]); + p->dwID, p->szLogin, p->szSocialID, p->dwLoginKey, + p->adwClientKey[0], p->adwClientKey[1], p->adwClientKey[2], p->adwClientKey[3]); bResult = 1; @@ -1808,35 +1822,35 @@ void CClientManager::QUERY_AUTH_LOGIN(CPeer * pkPeer, DWORD dwHandle, TPacketGDA } } -void CClientManager::GuildDepositMoney(TPacketGDGuildMoney* p) +void CClientManager::GuildDepositMoney(TPacketGDGuildMoney *p) { CGuildManager::instance().DepositMoney(p->dwGuild, p->iGold); } -void CClientManager::GuildWithdrawMoney(CPeer* peer, TPacketGDGuildMoney* p) +void CClientManager::GuildWithdrawMoney(CPeer *peer, TPacketGDGuildMoney *p) { CGuildManager::instance().WithdrawMoney(peer, p->dwGuild, p->iGold); } -void CClientManager::GuildWithdrawMoneyGiveReply(TPacketGDGuildMoneyWithdrawGiveReply* p) +void CClientManager::GuildWithdrawMoneyGiveReply(TPacketGDGuildMoneyWithdrawGiveReply *p) { CGuildManager::instance().WithdrawMoneyReply(p->dwGuild, p->bGiveSuccess, p->iChangeGold); } -void CClientManager::GuildWarBet(TPacketGDGuildWarBet * p) +void CClientManager::GuildWarBet(TPacketGDGuildWarBet *p) { CGuildManager::instance().Bet(p->dwWarID, p->szLogin, p->dwGold, p->dwGuild); } -void CClientManager::CreateObject(TPacketGDCreateObject * p) +void CClientManager::CreateObject(TPacketGDCreateObject *p) { using namespace building; char szQuery[512]; snprintf(szQuery, sizeof(szQuery), - "INSERT INTO object%s (land_id, vnum, map_index, x, y, x_rot, y_rot, z_rot) VALUES(%u, %u, %d, %d, %d, %f, %f, %f)", - GetTablePostfix(), p->dwLandID, p->dwVnum, p->lMapIndex, p->x, p->y, p->xRot, p->yRot, p->zRot); + "INSERT INTO object%s (land_id, vnum, map_index, x, y, x_rot, y_rot, z_rot) VALUES(%u, %u, %d, %d, %d, %f, %f, %f)", + GetTablePostfix(), p->dwLandID, p->dwVnum, p->lMapIndex, p->x, p->y, p->xRot, p->yRot, p->zRot); std::unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); @@ -1846,7 +1860,7 @@ void CClientManager::CreateObject(TPacketGDCreateObject * p) return; } - TObject * pkObj = new TObject; + TObject *pkObj = new TObject; memset(pkObj, 0, sizeof(TObject)); @@ -1891,12 +1905,12 @@ void CClientManager::DeleteObject(DWORD dwID) ForwardPacket(HEADER_DG_DELETE_OBJECT, &dwID, sizeof(DWORD)); } -void CClientManager::UpdateLand(DWORD * pdw) +void CClientManager::UpdateLand(DWORD *pdw) { DWORD dwID = pdw[0]; DWORD dwGuild = pdw[1]; - building::TLand * p = &m_vec_kLandTable[0]; + building::TLand *p = &m_vec_kLandTable[0]; DWORD i; @@ -1918,7 +1932,7 @@ void CClientManager::UpdateLand(DWORD * pdw) } // BLOCK_CHAT -void CClientManager::BlockChat(TPacketBlockChat* p) +void CClientManager::BlockChat(TPacketBlockChat *p) { char szQuery[256]; @@ -1927,7 +1941,7 @@ void CClientManager::BlockChat(TPacketBlockChat* p) else snprintf(szQuery, sizeof(szQuery), "SELECT id FROM player%s WHERE name = '%s'", GetTablePostfix(), p->szName); std::unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult * pRes = pmsg->Get(); + SQLResult *pRes = pmsg->Get(); if (pRes->uiNumRows) { @@ -1951,39 +1965,39 @@ void CClientManager::BlockChat(TPacketBlockChat* p) } // END_OF_BLOCK_CHAT -void CClientManager::MarriageAdd(TPacketMarriageAdd * p) +void CClientManager::MarriageAdd(TPacketMarriageAdd *p) { SPDLOG_DEBUG("MarriageAdd {} {} {} {}", p->dwPID1, p->dwPID2, p->szName1, p->szName2); marriage::CManager::instance().Add(p->dwPID1, p->dwPID2, p->szName1, p->szName2); } -void CClientManager::MarriageUpdate(TPacketMarriageUpdate * p) +void CClientManager::MarriageUpdate(TPacketMarriageUpdate *p) { SPDLOG_DEBUG("MarriageUpdate PID:{} {} LP:{} ST:{}", p->dwPID1, p->dwPID2, p->iLovePoint, p->byMarried); marriage::CManager::instance().Update(p->dwPID1, p->dwPID2, p->iLovePoint, p->byMarried); } -void CClientManager::MarriageRemove(TPacketMarriageRemove * p) +void CClientManager::MarriageRemove(TPacketMarriageRemove *p) { SPDLOG_DEBUG("MarriageRemove {} {}", p->dwPID1, p->dwPID2); marriage::CManager::instance().Remove(p->dwPID1, p->dwPID2); } -void CClientManager::WeddingRequest(TPacketWeddingRequest * p) +void CClientManager::WeddingRequest(TPacketWeddingRequest *p) { SPDLOG_DEBUG("WeddingRequest {} {}", p->dwPID1, p->dwPID2); ForwardPacket(HEADER_DG_WEDDING_REQUEST, p, sizeof(TPacketWeddingRequest)); - //marriage::CManager::instance().RegisterWedding(p->dwPID1, p->szName1, p->dwPID2, p->szName2); + // marriage::CManager::instance().RegisterWedding(p->dwPID1, p->szName1, p->dwPID2, p->szName2); } -void CClientManager::WeddingReady(TPacketWeddingReady * p) +void CClientManager::WeddingReady(TPacketWeddingReady *p) { SPDLOG_DEBUG("WeddingReady {} {}", p->dwPID1, p->dwPID2); ForwardPacket(HEADER_DG_WEDDING_READY, p, sizeof(TPacketWeddingReady)); marriage::CManager::instance().ReadyWedding(p->dwMapIndex, p->dwPID1, p->dwPID2); } -void CClientManager::WeddingEnd(TPacketWeddingEnd * p) +void CClientManager::WeddingEnd(TPacketWeddingEnd *p) { SPDLOG_DEBUG("WeddingEnd {} {}", p->dwPID1, p->dwPID2); marriage::CManager::instance().EndWedding(p->dwPID1, p->dwPID2); @@ -1993,7 +2007,7 @@ void CClientManager::WeddingEnd(TPacketWeddingEnd * p) // 캐시에 가격정보가 있으면 캐시를 업데이트 하고 캐시에 가격정보가 없다면 // 우선 기존의 데이터를 로드한 뒤에 기존의 정보로 캐시를 만들고 새로 받은 가격정보를 업데이트 한다. // -void CClientManager::MyshopPricelistUpdate(const TPacketMyshopPricelistHeader* pPacket) +void CClientManager::MyshopPricelistUpdate(const TPacketMyshopPricelistHeader *pPacket) { if (pPacket->byCount > SHOP_PRICELIST_MAX_NUM) { @@ -2001,7 +2015,7 @@ void CClientManager::MyshopPricelistUpdate(const TPacketMyshopPricelistHeader* p return; } - CItemPriceListTableCache* pCache = GetItemPriceListCache(pPacket->dwOwnerID); + CItemPriceListTableCache *pCache = GetItemPriceListCache(pPacket->dwOwnerID); if (pCache) { @@ -2010,19 +2024,19 @@ void CClientManager::MyshopPricelistUpdate(const TPacketMyshopPricelistHeader* p table.dwOwnerID = pPacket->dwOwnerID; table.byCount = pPacket->byCount; - const TItemPriceInfo * pInfo = reinterpret_cast(pPacket + sizeof(TPacketMyshopPricelistHeader)); + const TItemPriceInfo *pInfo = reinterpret_cast(pPacket + sizeof(TPacketMyshopPricelistHeader)); memcpy(table.aPriceInfo, pInfo, sizeof(TItemPriceInfo) * pPacket->byCount); pCache->UpdateList(&table); } else { - TItemPriceListTable* pUpdateTable = new TItemPriceListTable; + TItemPriceListTable *pUpdateTable = new TItemPriceListTable; pUpdateTable->dwOwnerID = pPacket->dwOwnerID; pUpdateTable->byCount = pPacket->byCount; - const TItemPriceInfo * pInfo = reinterpret_cast(pPacket + sizeof(TPacketMyshopPricelistHeader)); + const TItemPriceInfo *pInfo = reinterpret_cast(pPacket + sizeof(TPacketMyshopPricelistHeader)); memcpy(pUpdateTable->aPriceInfo, pInfo, sizeof(TItemPriceInfo) * pPacket->byCount); char szQuery[QUERY_MAX_LEN]; @@ -2034,26 +2048,24 @@ void CClientManager::MyshopPricelistUpdate(const TPacketMyshopPricelistHeader* p // MYSHOP_PRICE_LIST // 캐시된 가격정보가 있으면 캐시를 읽어 바로 전송하고 캐시에 정보가 없으면 DB 에 쿼리를 한다. // -void CClientManager::MyshopPricelistRequest(CPeer* peer, DWORD dwHandle, DWORD dwPlayerID) +void CClientManager::MyshopPricelistRequest(CPeer *peer, DWORD dwHandle, DWORD dwPlayerID) { - if (CItemPriceListTableCache* pCache = GetItemPriceListCache(dwPlayerID)) + if (CItemPriceListTableCache *pCache = GetItemPriceListCache(dwPlayerID)) { SPDLOG_DEBUG("Cache MyShopPricelist handle[{}] pid[{}]", dwHandle, dwPlayerID); - TItemPriceListTable* pTable = pCache->Get(false); + TItemPriceListTable *pTable = pCache->Get(false); TPacketMyshopPricelistHeader header = - { - pTable->dwOwnerID, - pTable->byCount - }; + { + pTable->dwOwnerID, + 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 { @@ -2081,14 +2093,14 @@ void CPacketInfo::Reset() m_map_info.clear(); } -void CClientManager::ProcessPackets(CPeer * peer) +void CClientManager::ProcessPackets(CPeer *peer) { - BYTE header; - DWORD dwHandle; - DWORD dwLength; - const char * data = NULL; - int i = 0; - int iCount = 0; + BYTE header; + DWORD dwHandle; + DWORD dwLength; + const char *data = NULL; + int i = 0; + int iCount = 0; while (peer->PeekPacket(i, header, dwHandle, dwLength, &data)) { @@ -2097,394 +2109,395 @@ void CClientManager::ProcessPackets(CPeer * peer) switch (header) { - case HEADER_GD_BOOT: - QUERY_BOOT(peer, (TPacketGDBoot *) data); - break; - - case HEADER_GD_HAMMER_OF_TOR: - break; - - case HEADER_GD_LOGIN_BY_KEY: - QUERY_LOGIN_BY_KEY(peer, dwHandle, (TPacketGDLoginByKey *) data); - break; - - case HEADER_GD_LOGOUT: - //SPDLOG_DEBUG("HEADER_GD_LOGOUT (handle: {} length: {})", dwHandle, dwLength); - QUERY_LOGOUT(peer, dwHandle, data); - break; - - case HEADER_GD_PLAYER_LOAD: - SPDLOG_TRACE("HEADER_GD_PLAYER_LOAD (handle: {} length: {})", dwHandle, dwLength); - QUERY_PLAYER_LOAD(peer, dwHandle, (TPlayerLoadPacket *) data); - break; - - case HEADER_GD_PLAYER_SAVE: - SPDLOG_TRACE("HEADER_GD_PLAYER_SAVE (handle: {} length: {})", dwHandle, dwLength); - QUERY_PLAYER_SAVE(peer, dwHandle, (TPlayerTable *) data); - break; - - case HEADER_GD_PLAYER_CREATE: - SPDLOG_DEBUG("HEADER_GD_PLAYER_CREATE (handle: {} length: {})", dwHandle, dwLength); - __QUERY_PLAYER_CREATE(peer, dwHandle, (TPlayerCreatePacket *) data); - SPDLOG_DEBUG("END"); - break; - - case HEADER_GD_PLAYER_DELETE: - SPDLOG_TRACE("HEADER_GD_PLAYER_DELETE (handle: {} length: {})", dwHandle, dwLength); - __QUERY_PLAYER_DELETE(peer, dwHandle, (TPlayerDeletePacket *) data); - break; - - case HEADER_GD_PLAYER_COUNT: - QUERY_PLAYER_COUNT(peer, (TPlayerCountPacket *) data); - break; - - case HEADER_GD_QUEST_SAVE: - SPDLOG_TRACE("HEADER_GD_QUEST_SAVE (handle: {} length: {})", dwHandle, dwLength); - QUERY_QUEST_SAVE(peer, (TQuestTable *) data, dwLength); - break; - - case HEADER_GD_SAFEBOX_LOAD: - QUERY_SAFEBOX_LOAD(peer, dwHandle, (TSafeboxLoadPacket *) data, 0); - break; - - case HEADER_GD_SAFEBOX_SAVE: - SPDLOG_TRACE("HEADER_GD_SAFEBOX_SAVE (handle: {} length: {})", dwHandle, dwLength); - QUERY_SAFEBOX_SAVE(peer, (TSafeboxTable *) data); - break; - - case HEADER_GD_SAFEBOX_CHANGE_SIZE: - QUERY_SAFEBOX_CHANGE_SIZE(peer, dwHandle, (TSafeboxChangeSizePacket *) data); - break; - - case HEADER_GD_SAFEBOX_CHANGE_PASSWORD: - QUERY_SAFEBOX_CHANGE_PASSWORD(peer, dwHandle, (TSafeboxChangePasswordPacket *) data); - break; - - case HEADER_GD_MALL_LOAD: - QUERY_SAFEBOX_LOAD(peer, dwHandle, (TSafeboxLoadPacket *) data, 1); - break; - - case HEADER_GD_EMPIRE_SELECT: - QUERY_EMPIRE_SELECT(peer, dwHandle, (TEmpireSelectPacket *) data); - break; - - case HEADER_GD_SETUP: - QUERY_SETUP(peer, dwHandle, data); - break; - - case HEADER_GD_GUILD_CREATE: - GuildCreate(peer, *(DWORD *) data); - break; - - case HEADER_GD_GUILD_SKILL_UPDATE: - GuildSkillUpdate(peer, (TPacketGuildSkillUpdate *) data); - break; - - case HEADER_GD_GUILD_EXP_UPDATE: - GuildExpUpdate(peer, (TPacketGuildExpUpdate *) data); - break; - - case HEADER_GD_GUILD_ADD_MEMBER: - GuildAddMember(peer, (TPacketGDGuildAddMember*) data); - break; - - case HEADER_GD_GUILD_REMOVE_MEMBER: - GuildRemoveMember(peer, (TPacketGuild*) data); - break; - - case HEADER_GD_GUILD_CHANGE_GRADE: - GuildChangeGrade(peer, (TPacketGuild*) data); - break; - - case HEADER_GD_GUILD_CHANGE_MEMBER_DATA: - GuildChangeMemberData(peer, (TPacketGuildChangeMemberData*) data); - break; - - case HEADER_GD_GUILD_DISBAND: - GuildDisband(peer, (TPacketGuild*) data); - break; - - case HEADER_GD_GUILD_WAR: - GuildWar(peer, (TPacketGuildWar*) data); - break; - - case HEADER_GD_GUILD_WAR_SCORE: - GuildWarScore(peer, (TPacketGuildWarScore*) data); - break; - - case HEADER_GD_GUILD_CHANGE_LADDER_POINT: - GuildChangeLadderPoint((TPacketGuildLadderPoint*) data); - break; - - case HEADER_GD_GUILD_USE_SKILL: - GuildUseSkill((TPacketGuildUseSkill*) data); - break; - - case HEADER_GD_FLUSH_CACHE: - QUERY_FLUSH_CACHE(peer, data); - break; - - case HEADER_GD_ITEM_SAVE: - QUERY_ITEM_SAVE(peer, data); - break; - - case HEADER_GD_ITEM_DESTROY: - QUERY_ITEM_DESTROY(peer, data); - break; - - case HEADER_GD_ITEM_FLUSH: - QUERY_ITEM_FLUSH(peer, data); - break; - - case HEADER_GD_ADD_AFFECT: - SPDLOG_TRACE("HEADER_GD_ADD_AFFECT"); - QUERY_ADD_AFFECT(peer, (TPacketGDAddAffect *) data); - break; - - case HEADER_GD_REMOVE_AFFECT: - SPDLOG_TRACE("HEADER_GD_REMOVE_AFFECT"); - QUERY_REMOVE_AFFECT(peer, (TPacketGDRemoveAffect *) data); - break; + case HEADER_GD_BOOT: + QUERY_BOOT(peer, (TPacketGDBoot *)data); + break; + + case HEADER_GD_HAMMER_OF_TOR: + break; + + case HEADER_GD_LOGIN_BY_KEY: + QUERY_LOGIN_BY_KEY(peer, dwHandle, (TPacketGDLoginByKey *)data); + break; + + case HEADER_GD_LOGOUT: + // SPDLOG_DEBUG("HEADER_GD_LOGOUT (handle: {} length: {})", dwHandle, dwLength); + QUERY_LOGOUT(peer, dwHandle, data); + break; + + case HEADER_GD_PLAYER_LOAD: + SPDLOG_TRACE("HEADER_GD_PLAYER_LOAD (handle: {} length: {})", dwHandle, dwLength); + QUERY_PLAYER_LOAD(peer, dwHandle, (TPlayerLoadPacket *)data); + break; + + case HEADER_GD_PLAYER_SAVE: + SPDLOG_TRACE("HEADER_GD_PLAYER_SAVE (handle: {} length: {})", dwHandle, dwLength); + QUERY_PLAYER_SAVE(peer, dwHandle, (TPlayerTable *)data); + break; + + case HEADER_GD_PLAYER_CREATE: + SPDLOG_DEBUG("HEADER_GD_PLAYER_CREATE (handle: {} length: {})", dwHandle, dwLength); + __QUERY_PLAYER_CREATE(peer, dwHandle, (TPlayerCreatePacket *)data); + SPDLOG_DEBUG("END"); + break; + + case HEADER_GD_PLAYER_DELETE: + SPDLOG_TRACE("HEADER_GD_PLAYER_DELETE (handle: {} length: {})", dwHandle, dwLength); + __QUERY_PLAYER_DELETE(peer, dwHandle, (TPlayerDeletePacket *)data); + break; + + case HEADER_GD_PLAYER_COUNT: + QUERY_PLAYER_COUNT(peer, (TPlayerCountPacket *)data); + break; + + case HEADER_GD_QUEST_SAVE: + SPDLOG_TRACE("HEADER_GD_QUEST_SAVE (handle: {} length: {})", dwHandle, dwLength); + QUERY_QUEST_SAVE(peer, (TQuestTable *)data, dwLength); + break; + + case HEADER_GD_SAFEBOX_LOAD: + QUERY_SAFEBOX_LOAD(peer, dwHandle, (TSafeboxLoadPacket *)data, 0); + break; + + case HEADER_GD_SAFEBOX_SAVE: + SPDLOG_TRACE("HEADER_GD_SAFEBOX_SAVE (handle: {} length: {})", dwHandle, dwLength); + QUERY_SAFEBOX_SAVE(peer, (TSafeboxTable *)data); + break; + + case HEADER_GD_SAFEBOX_CHANGE_SIZE: + QUERY_SAFEBOX_CHANGE_SIZE(peer, dwHandle, (TSafeboxChangeSizePacket *)data); + break; + + case HEADER_GD_SAFEBOX_CHANGE_PASSWORD: + QUERY_SAFEBOX_CHANGE_PASSWORD(peer, dwHandle, (TSafeboxChangePasswordPacket *)data); + break; + + case HEADER_GD_MALL_LOAD: + QUERY_SAFEBOX_LOAD(peer, dwHandle, (TSafeboxLoadPacket *)data, 1); + break; + + case HEADER_GD_EMPIRE_SELECT: + QUERY_EMPIRE_SELECT(peer, dwHandle, (TEmpireSelectPacket *)data); + break; + + case HEADER_GD_SETUP: + QUERY_SETUP(peer, dwHandle, data); + break; + + case HEADER_GD_GUILD_CREATE: + GuildCreate(peer, *(DWORD *)data); + break; + + case HEADER_GD_GUILD_SKILL_UPDATE: + GuildSkillUpdate(peer, (TPacketGuildSkillUpdate *)data); + break; + + case HEADER_GD_GUILD_EXP_UPDATE: + GuildExpUpdate(peer, (TPacketGuildExpUpdate *)data); + break; + + case HEADER_GD_GUILD_ADD_MEMBER: + GuildAddMember(peer, (TPacketGDGuildAddMember *)data); + break; + + case HEADER_GD_GUILD_REMOVE_MEMBER: + GuildRemoveMember(peer, (TPacketGuild *)data); + break; + + case HEADER_GD_GUILD_CHANGE_GRADE: + GuildChangeGrade(peer, (TPacketGuild *)data); + break; + + case HEADER_GD_GUILD_CHANGE_MEMBER_DATA: + GuildChangeMemberData(peer, (TPacketGuildChangeMemberData *)data); + break; + + case HEADER_GD_GUILD_DISBAND: + GuildDisband(peer, (TPacketGuild *)data); + break; + + case HEADER_GD_GUILD_WAR: + GuildWar(peer, (TPacketGuildWar *)data); + break; + + case HEADER_GD_GUILD_WAR_SCORE: + GuildWarScore(peer, (TPacketGuildWarScore *)data); + break; + + case HEADER_GD_GUILD_CHANGE_LADDER_POINT: + GuildChangeLadderPoint((TPacketGuildLadderPoint *)data); + break; + + case HEADER_GD_GUILD_USE_SKILL: + GuildUseSkill((TPacketGuildUseSkill *)data); + break; + + case HEADER_GD_FLUSH_CACHE: + QUERY_FLUSH_CACHE(peer, data); + break; + + case HEADER_GD_ITEM_SAVE: + QUERY_ITEM_SAVE(peer, data); + break; + + case HEADER_GD_ITEM_DESTROY: + QUERY_ITEM_DESTROY(peer, data); + break; + + case HEADER_GD_ITEM_FLUSH: + QUERY_ITEM_FLUSH(peer, data); + break; + + case HEADER_GD_ADD_AFFECT: + SPDLOG_TRACE("HEADER_GD_ADD_AFFECT"); + QUERY_ADD_AFFECT(peer, (TPacketGDAddAffect *)data); + break; + + case HEADER_GD_REMOVE_AFFECT: + SPDLOG_TRACE("HEADER_GD_REMOVE_AFFECT"); + QUERY_REMOVE_AFFECT(peer, (TPacketGDRemoveAffect *)data); + break; - case HEADER_GD_PARTY_CREATE: - QUERY_PARTY_CREATE(peer, (TPacketPartyCreate*) data); - break; + case HEADER_GD_PARTY_CREATE: + QUERY_PARTY_CREATE(peer, (TPacketPartyCreate *)data); + break; - case HEADER_GD_PARTY_DELETE: - QUERY_PARTY_DELETE(peer, (TPacketPartyDelete*) data); - break; + case HEADER_GD_PARTY_DELETE: + QUERY_PARTY_DELETE(peer, (TPacketPartyDelete *)data); + break; - case HEADER_GD_PARTY_ADD: - QUERY_PARTY_ADD(peer, (TPacketPartyAdd*) data); - break; - - case HEADER_GD_PARTY_REMOVE: - QUERY_PARTY_REMOVE(peer, (TPacketPartyRemove*) data); - break; - - case HEADER_GD_PARTY_STATE_CHANGE: - QUERY_PARTY_STATE_CHANGE(peer, (TPacketPartyStateChange*) data); - break; - - case HEADER_GD_PARTY_SET_MEMBER_LEVEL: - QUERY_PARTY_SET_MEMBER_LEVEL(peer, (TPacketPartySetMemberLevel*) data); - break; - - case HEADER_GD_RELOAD_PROTO: - QUERY_RELOAD_PROTO(); - break; - - case HEADER_GD_CHANGE_NAME: - QUERY_CHANGE_NAME(peer, dwHandle, (TPacketGDChangeName *) data); - break; - - case HEADER_GD_AUTH_LOGIN: - QUERY_AUTH_LOGIN(peer, dwHandle, (TPacketGDAuthLogin *) data); - break; - - case HEADER_GD_REQUEST_GUILD_PRIV: - AddGuildPriv((TPacketGiveGuildPriv*)data); - break; - - case HEADER_GD_REQUEST_EMPIRE_PRIV: - AddEmpirePriv((TPacketGiveEmpirePriv*)data); - break; - - case HEADER_GD_REQUEST_CHARACTER_PRIV: - AddCharacterPriv((TPacketGiveCharacterPriv*) data); - break; - - case HEADER_GD_MONEY_LOG: - MoneyLog((TPacketMoneyLog*)data); - break; - - case HEADER_GD_GUILD_DEPOSIT_MONEY: - GuildDepositMoney((TPacketGDGuildMoney*)data); - break; - - case HEADER_GD_GUILD_WITHDRAW_MONEY: - GuildWithdrawMoney(peer, (TPacketGDGuildMoney*)data); - break; - - case HEADER_GD_GUILD_WITHDRAW_MONEY_GIVE_REPLY: - GuildWithdrawMoneyGiveReply((TPacketGDGuildMoneyWithdrawGiveReply*)data); - break; - - case HEADER_GD_GUILD_WAR_BET: - GuildWarBet((TPacketGDGuildWarBet *) data); - break; - - case HEADER_GD_SET_EVENT_FLAG: - SetEventFlag((TPacketSetEventFlag*) data); - break; - - case HEADER_GD_CREATE_OBJECT: - CreateObject((TPacketGDCreateObject *) data); - break; - - case HEADER_GD_DELETE_OBJECT: - DeleteObject(*(DWORD *) data); - break; - - case HEADER_GD_UPDATE_LAND: - UpdateLand((DWORD *) data); - break; - - case HEADER_GD_MARRIAGE_ADD: - MarriageAdd((TPacketMarriageAdd *) data); - break; - - case HEADER_GD_MARRIAGE_UPDATE: - MarriageUpdate((TPacketMarriageUpdate *) data); - break; - - case HEADER_GD_MARRIAGE_REMOVE: - MarriageRemove((TPacketMarriageRemove *) data); - break; - - case HEADER_GD_WEDDING_REQUEST: - WeddingRequest((TPacketWeddingRequest *) data); - break; - - case HEADER_GD_WEDDING_READY: - WeddingReady((TPacketWeddingReady *) data); - break; - - case HEADER_GD_WEDDING_END: - WeddingEnd((TPacketWeddingEnd *) data); - break; - - // BLOCK_CHAT - case HEADER_GD_BLOCK_CHAT: - BlockChat((TPacketBlockChat *) data); - break; - // END_OF_BLOCK_CHAT - - // MYSHOP_PRICE_LIST - case HEADER_GD_MYSHOP_PRICELIST_UPDATE: - MyshopPricelistUpdate((TPacketMyshopPricelistHeader*)data); - break; - - case HEADER_GD_MYSHOP_PRICELIST_REQ: - MyshopPricelistRequest(peer, dwHandle, *(DWORD*)data); - break; - // END_OF_MYSHOP_PRICE_LIST - - //RELOAD_ADMIN - case HEADER_GD_RELOAD_ADMIN: - ReloadAdmin(peer, (TPacketReloadAdmin*)data); - break; - //END_RELOAD_ADMIN - - case HEADER_GD_BREAK_MARRIAGE: - BreakMarriage(peer, data); - break; - - //MOANRCH - case HEADER_GD_ELECT_MONARCH: - Election(peer, dwHandle, data); - break; - - case HEADER_GD_CANDIDACY: - Candidacy(peer, dwHandle, data); - break; - - case HEADER_GD_ADD_MONARCH_MONEY: - AddMonarchMoney(peer, dwHandle, data); - break; - - case HEADER_GD_DEC_MONARCH_MONEY: - DecMonarchMoney(peer, dwHandle, data); - break; - - case HEADER_GD_TAKE_MONARCH_MONEY: - TakeMonarchMoney(peer, dwHandle, data); - break; - - case HEADER_GD_COME_TO_VOTE: - ComeToVote(peer, dwHandle, data); - break; - - case HEADER_GD_RMCANDIDACY: //< 후보 제거 (운영자) - RMCandidacy(peer, dwHandle, data); - break; - - case HEADER_GD_SETMONARCH: ///<군주설정 (운영자) - SetMonarch(peer, dwHandle, data); - break; - - case HEADER_GD_RMMONARCH: ///<군주삭제 - RMMonarch(peer, dwHandle, data); - break; - //END_MONARCH - - case HEADER_GD_CHANGE_MONARCH_LORD : - ChangeMonarchLord(peer, dwHandle, (TPacketChangeMonarchLord*)data); - break; - - case HEADER_GD_REQ_SPARE_ITEM_ID_RANGE : - SendSpareItemIDRange(peer); - break; - - case HEADER_GD_REQ_CHANGE_GUILD_MASTER : - GuildChangeMaster((TPacketChangeGuildMaster*) data); - break; - - case HEADER_GD_UPDATE_HORSE_NAME : - UpdateHorseName((TPacketUpdateHorseName*) data, peer); - break; - - case HEADER_GD_REQ_HORSE_NAME : - AckHorseName(*(DWORD*)data, peer); - break; - - case HEADER_GD_DC: - DeleteLoginKey((TPacketDC*) data); - break; - - case HEADER_GD_VALID_LOGOUT: - ResetLastPlayerID((TPacketNeedLoginLogInfo*)data); - break; - - case HEADER_GD_REQUEST_CHARGE_CASH: - ChargeCash((TRequestChargeCash*)data); - break; - - //delete gift notify icon - - case HEADER_GD_DELETE_AWARDID: - DeleteAwardId((TPacketDeleteAwardID*) data); - break; - - case HEADER_GD_UPDATE_CHANNELSTATUS: - UpdateChannelStatus((SChannelStatus*) data); - break; - case HEADER_GD_REQUEST_CHANNELSTATUS: - RequestChannelStatus(peer, dwHandle); - break; - default: - SPDLOG_ERROR("Unknown header (header: {} handle: {} length: {})", header, dwHandle, dwLength); - break; + case HEADER_GD_PARTY_ADD: + QUERY_PARTY_ADD(peer, (TPacketPartyAdd *)data); + break; + + case HEADER_GD_PARTY_REMOVE: + QUERY_PARTY_REMOVE(peer, (TPacketPartyRemove *)data); + break; + + case HEADER_GD_PARTY_STATE_CHANGE: + QUERY_PARTY_STATE_CHANGE(peer, (TPacketPartyStateChange *)data); + break; + + case HEADER_GD_PARTY_SET_MEMBER_LEVEL: + QUERY_PARTY_SET_MEMBER_LEVEL(peer, (TPacketPartySetMemberLevel *)data); + break; + + case HEADER_GD_RELOAD_PROTO: + QUERY_RELOAD_PROTO(); + break; + + case HEADER_GD_CHANGE_NAME: + QUERY_CHANGE_NAME(peer, dwHandle, (TPacketGDChangeName *)data); + break; + + case HEADER_GD_AUTH_LOGIN: + QUERY_AUTH_LOGIN(peer, dwHandle, (TPacketGDAuthLogin *)data); + break; + + case HEADER_GD_REQUEST_GUILD_PRIV: + AddGuildPriv((TPacketGiveGuildPriv *)data); + break; + + case HEADER_GD_REQUEST_EMPIRE_PRIV: + AddEmpirePriv((TPacketGiveEmpirePriv *)data); + break; + + case HEADER_GD_REQUEST_CHARACTER_PRIV: + AddCharacterPriv((TPacketGiveCharacterPriv *)data); + break; + + case HEADER_GD_MONEY_LOG: + MoneyLog((TPacketMoneyLog *)data); + break; + + case HEADER_GD_GUILD_DEPOSIT_MONEY: + GuildDepositMoney((TPacketGDGuildMoney *)data); + break; + + case HEADER_GD_GUILD_WITHDRAW_MONEY: + GuildWithdrawMoney(peer, (TPacketGDGuildMoney *)data); + break; + + case HEADER_GD_GUILD_WITHDRAW_MONEY_GIVE_REPLY: + GuildWithdrawMoneyGiveReply((TPacketGDGuildMoneyWithdrawGiveReply *)data); + break; + + case HEADER_GD_GUILD_WAR_BET: + GuildWarBet((TPacketGDGuildWarBet *)data); + break; + + case HEADER_GD_SET_EVENT_FLAG: + SetEventFlag((TPacketSetEventFlag *)data); + break; + + case HEADER_GD_CREATE_OBJECT: + CreateObject((TPacketGDCreateObject *)data); + break; + + case HEADER_GD_DELETE_OBJECT: + DeleteObject(*(DWORD *)data); + break; + + case HEADER_GD_UPDATE_LAND: + UpdateLand((DWORD *)data); + break; + + case HEADER_GD_MARRIAGE_ADD: + MarriageAdd((TPacketMarriageAdd *)data); + break; + + case HEADER_GD_MARRIAGE_UPDATE: + MarriageUpdate((TPacketMarriageUpdate *)data); + break; + + case HEADER_GD_MARRIAGE_REMOVE: + MarriageRemove((TPacketMarriageRemove *)data); + break; + + case HEADER_GD_WEDDING_REQUEST: + WeddingRequest((TPacketWeddingRequest *)data); + break; + + case HEADER_GD_WEDDING_READY: + WeddingReady((TPacketWeddingReady *)data); + break; + + case HEADER_GD_WEDDING_END: + WeddingEnd((TPacketWeddingEnd *)data); + break; + + // BLOCK_CHAT + case HEADER_GD_BLOCK_CHAT: + BlockChat((TPacketBlockChat *)data); + break; + // END_OF_BLOCK_CHAT + + // MYSHOP_PRICE_LIST + case HEADER_GD_MYSHOP_PRICELIST_UPDATE: + MyshopPricelistUpdate((TPacketMyshopPricelistHeader *)data); + break; + + case HEADER_GD_MYSHOP_PRICELIST_REQ: + MyshopPricelistRequest(peer, dwHandle, *(DWORD *)data); + break; + // END_OF_MYSHOP_PRICE_LIST + + // RELOAD_ADMIN + case HEADER_GD_RELOAD_ADMIN: + ReloadAdmin(peer, (TPacketReloadAdmin *)data); + break; + // END_RELOAD_ADMIN + + case HEADER_GD_BREAK_MARRIAGE: + BreakMarriage(peer, data); + break; + + // MOANRCH + case HEADER_GD_ELECT_MONARCH: + Election(peer, dwHandle, data); + break; + + case HEADER_GD_CANDIDACY: + Candidacy(peer, dwHandle, data); + break; + + case HEADER_GD_ADD_MONARCH_MONEY: + AddMonarchMoney(peer, dwHandle, data); + break; + + case HEADER_GD_DEC_MONARCH_MONEY: + DecMonarchMoney(peer, dwHandle, data); + break; + + case HEADER_GD_TAKE_MONARCH_MONEY: + TakeMonarchMoney(peer, dwHandle, data); + break; + + case HEADER_GD_COME_TO_VOTE: + ComeToVote(peer, dwHandle, data); + break; + + case HEADER_GD_RMCANDIDACY: //< 후보 제거 (운영자) + RMCandidacy(peer, dwHandle, data); + break; + + case HEADER_GD_SETMONARCH: ///< 군주설정 (운영자) + SetMonarch(peer, dwHandle, data); + break; + + case HEADER_GD_RMMONARCH: ///< 군주삭제 + RMMonarch(peer, dwHandle, data); + break; + // END_MONARCH + + case HEADER_GD_CHANGE_MONARCH_LORD: + ChangeMonarchLord(peer, dwHandle, (TPacketChangeMonarchLord *)data); + break; + + case HEADER_GD_REQ_SPARE_ITEM_ID_RANGE: + SendSpareItemIDRange(peer); + break; + + case HEADER_GD_REQ_CHANGE_GUILD_MASTER: + GuildChangeMaster((TPacketChangeGuildMaster *)data); + break; + + case HEADER_GD_UPDATE_HORSE_NAME: + UpdateHorseName((TPacketUpdateHorseName *)data, peer); + break; + + case HEADER_GD_REQ_HORSE_NAME: + AckHorseName(*(DWORD *)data, peer); + break; + + case HEADER_GD_DC: + DeleteLoginKey((TPacketDC *)data); + break; + + case HEADER_GD_VALID_LOGOUT: + ResetLastPlayerID((TPacketNeedLoginLogInfo *)data); + break; + + case HEADER_GD_REQUEST_CHARGE_CASH: + ChargeCash((TRequestChargeCash *)data); + break; + + // delete gift notify icon + + case HEADER_GD_DELETE_AWARDID: + DeleteAwardId((TPacketDeleteAwardID *)data); + break; + + case HEADER_GD_UPDATE_CHANNELSTATUS: + UpdateChannelStatus((SChannelStatus *)data); + break; + case HEADER_GD_REQUEST_CHANNELSTATUS: + RequestChannelStatus(peer, dwHandle); + break; + default: + SPDLOG_ERROR("Unknown header (header: {} handle: {} length: {})", header, dwHandle, dwLength); + break; } } peer->RecvEnd(i); } -CPeer * CClientManager::AddPeer(bufferevent* bufev, sockaddr* addr) +CPeer *CClientManager::AddPeer(bufferevent *bufev, sockaddr *addr) { - auto* pPeer = new CPeer; + auto *pPeer = new CPeer; - if (!pPeer->Accept(bufev, addr)) { - delete pPeer; - return nullptr; - } + if (!pPeer->Accept(bufev, addr)) + { + delete pPeer; + return nullptr; + } - m_peerList.push_front(pPeer); - return pPeer; + m_peerList.push_front(pPeer); + return pPeer; } -void CClientManager::RemovePeer(CPeer * pPeer) +void CClientManager::RemovePeer(CPeer *pPeer) { if (m_pkAuthPeer == pPeer) { @@ -2496,7 +2509,7 @@ void CClientManager::RemovePeer(CPeer * pPeer) while (it != m_map_kLogonAccount.end()) { - CLoginData * pkLD = it->second; + CLoginData *pkLD = it->second; if (pkLD->GetConnectedPeerHandle() == pPeer->GetHandle()) { @@ -2522,11 +2535,11 @@ void CClientManager::RemovePeer(CPeer * pPeer) delete pPeer; } -CPeer * CClientManager::GetPeer(IDENT ident) +CPeer *CClientManager::GetPeer(IDENT ident) { - for (itertype(m_peerList) i = m_peerList.begin(); i != m_peerList.end();++i) + for (itertype(m_peerList) i = m_peerList.begin(); i != m_peerList.end(); ++i) { - CPeer * tmp = *i; + CPeer *tmp = *i; if (tmp->GetHandle() == ident) return tmp; @@ -2535,12 +2548,12 @@ CPeer * CClientManager::GetPeer(IDENT ident) return NULL; } -CPeer * CClientManager::GetAuthPeer() +CPeer *CClientManager::GetAuthPeer() { - return m_pkAuthPeer; + return m_pkAuthPeer; } -CPeer * CClientManager::GetAnyPeer() +CPeer *CClientManager::GetAnyPeer() { if (m_peerList.empty()) return NULL; @@ -2551,104 +2564,104 @@ CPeer * CClientManager::GetAnyPeer() // DB 매니저로 부터 받은 결과를 처리한다. // // @version 05/06/10 Bang2ni - 가격정보 관련 쿼리(QID_ITEMPRICE_XXX) 추가 -int CClientManager::AnalyzeQueryResult(SQLMsg * msg) +int CClientManager::AnalyzeQueryResult(SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - CPeer * peer = GetPeer(qi->dwIdent); + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + CPeer *peer = GetPeer(qi->dwIdent); #ifdef _TEST if (qi->iType != QID_ITEM_AWARD_LOAD) - SPDLOG_DEBUG("AnalyzeQueryResult {}", qi->iType); + SPDLOG_DEBUG("AnalyzeQueryResult {}", qi->iType); #endif switch (qi->iType) { - case QID_ITEM_AWARD_LOAD: - ItemAwardManager::instance().Load(msg); - delete qi; - return true; + case QID_ITEM_AWARD_LOAD: + ItemAwardManager::instance().Load(msg); + delete qi; + return true; - case QID_GUILD_RANKING: - CGuildManager::instance().ResultRanking(msg->Get()->pSQLResult); - break; + case QID_GUILD_RANKING: + CGuildManager::instance().ResultRanking(msg->Get()->pSQLResult); + break; - // MYSHOP_PRICE_LIST - case QID_ITEMPRICE_LOAD_FOR_UPDATE: - RESULT_PRICELIST_LOAD_FOR_UPDATE(msg); - break; - // END_OF_MYSHOP_PRICE_LIST + // MYSHOP_PRICE_LIST + case QID_ITEMPRICE_LOAD_FOR_UPDATE: + RESULT_PRICELIST_LOAD_FOR_UPDATE(msg); + break; + // END_OF_MYSHOP_PRICE_LIST } if (!peer) - { - //SPDLOG_ERROR("CClientManager::AnalyzeQueryResult: peer not exist anymore. (ident: {})", qi->dwIdent); + { + // SPDLOG_ERROR("CClientManager::AnalyzeQueryResult: peer not exist anymore. (ident: {})", qi->dwIdent); delete qi; return true; } switch (qi->iType) { - case QID_PLAYER: - case QID_ITEM: - case QID_QUEST: - case QID_AFFECT: - RESULT_COMPOSITE_PLAYER(peer, msg, qi->iType); - break; + case QID_PLAYER: + case QID_ITEM: + case QID_QUEST: + case QID_AFFECT: + RESULT_COMPOSITE_PLAYER(peer, msg, qi->iType); + break; - case QID_LOGIN: - RESULT_LOGIN(peer, msg); - break; + case QID_LOGIN: + RESULT_LOGIN(peer, msg); + break; - case QID_SAFEBOX_LOAD: - SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_LOAD"); - RESULT_SAFEBOX_LOAD(peer, msg); - break; + case QID_SAFEBOX_LOAD: + SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_LOAD"); + RESULT_SAFEBOX_LOAD(peer, msg); + break; - case QID_SAFEBOX_CHANGE_SIZE: - SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_CHANGE_SIZE"); - RESULT_SAFEBOX_CHANGE_SIZE(peer, msg); - break; + case QID_SAFEBOX_CHANGE_SIZE: + SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_CHANGE_SIZE"); + RESULT_SAFEBOX_CHANGE_SIZE(peer, msg); + break; - case QID_SAFEBOX_CHANGE_PASSWORD: - SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_CHANGE_PASSWORD {}", (void*) msg); - RESULT_SAFEBOX_CHANGE_PASSWORD(peer, msg); - break; + case QID_SAFEBOX_CHANGE_PASSWORD: + SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_CHANGE_PASSWORD {}", (void *)msg); + RESULT_SAFEBOX_CHANGE_PASSWORD(peer, msg); + break; - case QID_SAFEBOX_CHANGE_PASSWORD_SECOND: - SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_CHANGE_PASSWORD {}", (void*) msg); - RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(peer, msg); - break; + case QID_SAFEBOX_CHANGE_PASSWORD_SECOND: + SPDLOG_DEBUG("QUERY_RESULT: HEADER_GD_SAFEBOX_CHANGE_PASSWORD {}", (void *)msg); + RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(peer, msg); + break; - case QID_SAFEBOX_SAVE: - case QID_ITEM_SAVE: - case QID_ITEM_DESTROY: - case QID_QUEST_SAVE: - case QID_PLAYER_SAVE: - case QID_ITEM_AWARD_TAKEN: - break; + case QID_SAFEBOX_SAVE: + case QID_ITEM_SAVE: + case QID_ITEM_DESTROY: + case QID_QUEST_SAVE: + case QID_PLAYER_SAVE: + case QID_ITEM_AWARD_TAKEN: + break; - // PLAYER_INDEX_CREATE_BUG_FIX - case QID_PLAYER_INDEX_CREATE: - RESULT_PLAYER_INDEX_CREATE(peer, msg); - break; - // END_PLAYER_INDEX_CREATE_BUG_FIX + // PLAYER_INDEX_CREATE_BUG_FIX + case QID_PLAYER_INDEX_CREATE: + RESULT_PLAYER_INDEX_CREATE(peer, msg); + break; + // END_PLAYER_INDEX_CREATE_BUG_FIX - case QID_PLAYER_DELETE: - __RESULT_PLAYER_DELETE(peer, msg); - break; + case QID_PLAYER_DELETE: + __RESULT_PLAYER_DELETE(peer, msg); + break; - case QID_LOGIN_BY_KEY: - RESULT_LOGIN_BY_KEY(peer, msg); - break; + case QID_LOGIN_BY_KEY: + RESULT_LOGIN_BY_KEY(peer, msg); + break; - // MYSHOP_PRICE_LIST - case QID_ITEMPRICE_LOAD: - RESULT_PRICELIST_LOAD(peer, msg); - break; - // END_OF_MYSHOP_PRICE_LIST + // MYSHOP_PRICE_LIST + case QID_ITEMPRICE_LOAD: + RESULT_PRICELIST_LOAD(peer, msg); + break; + // END_OF_MYSHOP_PRICE_LIST - default: - SPDLOG_DEBUG("CClientManager::AnalyzeQueryResult unknown query result type: {}, str: {}", qi->iType, msg->stQuery); - break; + default: + SPDLOG_DEBUG("CClientManager::AnalyzeQueryResult unknown query result type: {}, str: {}", qi->iType, msg->stQuery); + break; } delete qi; @@ -2656,14 +2669,14 @@ int CClientManager::AnalyzeQueryResult(SQLMsg * msg) } void UsageLog() -{ - FILE* fp = NULL; +{ + FILE *fp = NULL; - time_t ct; - char *time_s; - struct tm lt; + time_t ct; + char *time_s; + struct tm lt; - int avg = g_dwUsageAvg / 3600; // 60 초 * 60 분 + int avg = g_dwUsageAvg / 3600; // 60 초 * 60 분 fp = fopen("usage.txt", "a+"); @@ -2709,55 +2722,55 @@ int CClientManager::Process() { if (g_test_server) { - - if (!(thecore_heart->pulse % thecore_heart->passes_per_sec * 10)) - + + if (!(thecore_heart->pulse % thecore_heart->passes_per_sec * 10)) + { SPDLOG_TRACE("[{:9}] return {}/{}/{}/{} async {}/{}/{}/{}", - thecore_heart->pulse, - CDBManager::instance().CountReturnQuery(SQL_PLAYER), - CDBManager::instance().CountReturnResult(SQL_PLAYER), - CDBManager::instance().CountReturnQueryFinished(SQL_PLAYER), - CDBManager::instance().CountReturnCopiedQuery(SQL_PLAYER), - CDBManager::instance().CountAsyncQuery(SQL_PLAYER), - CDBManager::instance().CountAsyncResult(SQL_PLAYER), - CDBManager::instance().CountAsyncQueryFinished(SQL_PLAYER), - CDBManager::instance().CountAsyncCopiedQuery(SQL_PLAYER)); + thecore_heart->pulse, + CDBManager::instance().CountReturnQuery(SQL_PLAYER), + CDBManager::instance().CountReturnResult(SQL_PLAYER), + CDBManager::instance().CountReturnQueryFinished(SQL_PLAYER), + CDBManager::instance().CountReturnCopiedQuery(SQL_PLAYER), + CDBManager::instance().CountAsyncQuery(SQL_PLAYER), + CDBManager::instance().CountAsyncResult(SQL_PLAYER), + CDBManager::instance().CountAsyncQueryFinished(SQL_PLAYER), + CDBManager::instance().CountAsyncCopiedQuery(SQL_PLAYER)); if ((thecore_heart->pulse % 50) == 0) - SPDLOG_TRACE("[{:9}] return {}/{}/{} async {}/{}/{}", - thecore_heart->pulse, - CDBManager::instance().CountReturnQuery(SQL_PLAYER), - CDBManager::instance().CountReturnResult(SQL_PLAYER), - CDBManager::instance().CountReturnQueryFinished(SQL_PLAYER), - CDBManager::instance().CountAsyncQuery(SQL_PLAYER), - CDBManager::instance().CountAsyncResult(SQL_PLAYER), - CDBManager::instance().CountAsyncQueryFinished(SQL_PLAYER)); + SPDLOG_TRACE("[{:9}] return {}/{}/{} async {}/{}/{}", + thecore_heart->pulse, + CDBManager::instance().CountReturnQuery(SQL_PLAYER), + CDBManager::instance().CountReturnResult(SQL_PLAYER), + CDBManager::instance().CountReturnQueryFinished(SQL_PLAYER), + CDBManager::instance().CountAsyncQuery(SQL_PLAYER), + CDBManager::instance().CountAsyncResult(SQL_PLAYER), + CDBManager::instance().CountAsyncQueryFinished(SQL_PLAYER)); } } else { - SPDLOG_TRACE("[{:9}] return {}/{}/{}/{} async {}/{}/{}/{}", - thecore_heart->pulse, - CDBManager::instance().CountReturnQuery(SQL_PLAYER), - CDBManager::instance().CountReturnResult(SQL_PLAYER), - CDBManager::instance().CountReturnQueryFinished(SQL_PLAYER), - CDBManager::instance().CountReturnCopiedQuery(SQL_PLAYER), - CDBManager::instance().CountAsyncQuery(SQL_PLAYER), - CDBManager::instance().CountAsyncResult(SQL_PLAYER), - CDBManager::instance().CountAsyncQueryFinished(SQL_PLAYER), - CDBManager::instance().CountAsyncCopiedQuery(SQL_PLAYER)); + SPDLOG_TRACE("[{:9}] return {}/{}/{}/{} async {}/{}/{}/{}", + thecore_heart->pulse, + CDBManager::instance().CountReturnQuery(SQL_PLAYER), + CDBManager::instance().CountReturnResult(SQL_PLAYER), + CDBManager::instance().CountReturnQueryFinished(SQL_PLAYER), + CDBManager::instance().CountReturnCopiedQuery(SQL_PLAYER), + CDBManager::instance().CountAsyncQuery(SQL_PLAYER), + CDBManager::instance().CountAsyncResult(SQL_PLAYER), + CDBManager::instance().CountAsyncQueryFinished(SQL_PLAYER), + CDBManager::instance().CountAsyncCopiedQuery(SQL_PLAYER)); - if ((thecore_heart->pulse % 50) == 0) - SPDLOG_TRACE("[{:9}] return {}/{}/{} async {}/{}/{}", - thecore_heart->pulse, - CDBManager::instance().CountReturnQuery(SQL_PLAYER), - CDBManager::instance().CountReturnResult(SQL_PLAYER), - CDBManager::instance().CountReturnQueryFinished(SQL_PLAYER), - CDBManager::instance().CountAsyncQuery(SQL_PLAYER), - CDBManager::instance().CountAsyncResult(SQL_PLAYER), - CDBManager::instance().CountAsyncQueryFinished(SQL_PLAYER)); - } + if ((thecore_heart->pulse % 50) == 0) + SPDLOG_TRACE("[{:9}] return {}/{}/{} async {}/{}/{}", + thecore_heart->pulse, + CDBManager::instance().CountReturnQuery(SQL_PLAYER), + CDBManager::instance().CountReturnResult(SQL_PLAYER), + CDBManager::instance().CountReturnQueryFinished(SQL_PLAYER), + CDBManager::instance().CountAsyncQuery(SQL_PLAYER), + CDBManager::instance().CountAsyncResult(SQL_PLAYER), + CDBManager::instance().CountAsyncQueryFinished(SQL_PLAYER)); + } CDBManager::instance().ResetCounter(); @@ -2773,12 +2786,11 @@ int CClientManager::Process() m_iCacheFlushCount = 0; - - //플레이어 플러쉬 + // 플레이어 플러쉬 UpdatePlayerCache(); - //아이템 플러쉬 + // 아이템 플러쉬 UpdateItemCache(); - //로그아웃시 처리- 캐쉬셋 플러쉬 + // 로그아웃시 처리- 캐쉬셋 플러쉬 UpdateLogoutPlayer(); // MYSHOP_PRICE_LIST @@ -2820,48 +2832,48 @@ int CClientManager::Process() SPDLOG_TRACE("QUERY:\n{}-------------------- MAX : {}", buf, count); g_query_info.Reset(); */ - SPDLOG_TRACE("QUERY: MAIN[{}] ASYNC[{}]", g_query_count[0], g_query_count[1]); - g_query_count[0] = 0; - g_query_count[1] = 0; - ///////////////////////////////////////////////////////////////// + SPDLOG_TRACE("QUERY: MAIN[{}] ASYNC[{}]", g_query_count[0], g_query_count[1]); + g_query_count[0] = 0; + g_query_count[1] = 0; + ///////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// - /* - buf[0] = '\0'; - len = 0; + ///////////////////////////////////////////////////////////////// + /* + buf[0] = '\0'; + len = 0; - it = g_item_info.m_map_info.begin(); + it = g_item_info.m_map_info.begin(); - count = 0; - while (it != g_item_info.m_map_info.end()) - { - len += snprintf(buf + len, sizeof(buf) - len, "%5d %3d\n", it->first, it->second); - count += it->second; - it++; - } + count = 0; + while (it != g_item_info.m_map_info.end()) + { + len += snprintf(buf + len, sizeof(buf) - len, "%5d %3d\n", it->first, it->second); + count += it->second; + it++; + } - SPDLOG_TRACE("ITEM:\n{}-------------------- MAX : {}", buf, count); - g_item_info.Reset(); - */ - SPDLOG_TRACE("ITEM:{}", g_item_count); - g_item_count = 0; - ///////////////////////////////////////////////////////////////// - } + SPDLOG_TRACE("ITEM:\n{}-------------------- MAX : {}", buf, count); + g_item_info.Reset(); + */ + SPDLOG_TRACE("ITEM:{}", g_item_count); + g_item_count = 0; + ///////////////////////////////////////////////////////////////// + } - if (!(thecore_heart->pulse % (thecore_heart->passes_per_sec * 60))) // 60초에 한번 - { - // 유니크 아이템을 위한 시간을 보낸다. - CClientManager::instance().SendTime(); - } + if (!(thecore_heart->pulse % (thecore_heart->passes_per_sec * 60))) // 60초에 한번 + { + // 유니크 아이템을 위한 시간을 보낸다. + CClientManager::instance().SendTime(); + } - if (!(thecore_heart->pulse % (thecore_heart->passes_per_sec * 3600))) // 한시간에 한번 - { - CMoneyLog::instance().Save(); + if (!(thecore_heart->pulse % (thecore_heart->passes_per_sec * 3600))) // 한시간에 한번 + { + CMoneyLog::instance().Save(); } } - // Process network events - event_base_loop(m_base, EVLOOP_NONBLOCK); + // Process network events + event_base_loop(m_base, EVLOOP_NONBLOCK); return 1; } @@ -2883,11 +2895,11 @@ void CClientManager::SendTime() ForwardPacket(HEADER_DG_TIME, &now, sizeof(time_t)); } -void CClientManager::ForwardPacket(BYTE header, const void* data, int size, BYTE bChannel, CPeer* except) +void CClientManager::ForwardPacket(BYTE header, const void *data, int size, BYTE bChannel, CPeer *except) { for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it) { - CPeer * peer = *it; + CPeer *peer = *it; if (peer == except) continue; @@ -2905,9 +2917,9 @@ void CClientManager::ForwardPacket(BYTE header, const void* data, int size, BYTE } } -void CClientManager::SendNotice(const char * c_pszFormat, ...) +void CClientManager::SendNotice(const char *c_pszFormat, ...) { - char szBuf[255+1]; + char szBuf[255 + 1]; va_list args; va_start(args, c_pszFormat); @@ -2928,7 +2940,7 @@ bool CClientManager::InitializeNowItemID() { DWORD dwMin, dwMax; - //아이템 ID를 초기화 한다. + // 아이템 ID를 초기화 한다. if (!CConfig::instance().GetTwoValue("ITEM_ID_RANGE", &dwMin, &dwMax)) { SPDLOG_ERROR("conf.txt: Cannot find ITEM_ID_RANGE [start_item_id] [end_item_id]"); @@ -2936,13 +2948,13 @@ bool CClientManager::InitializeNowItemID() } SPDLOG_DEBUG("ItemRange From File {} ~ {} ", dwMin, dwMax); - + if (CItemIDRangeManager::instance().BuildRange(dwMin, dwMax, m_itemRange) == false) { SPDLOG_ERROR("Can not build ITEM_ID_RANGE"); return false; } - + SPDLOG_DEBUG(" Init Success Start {} End {} Now {}", m_itemRange.dwMin, m_itemRange.dwMax, m_itemRange.dwUsableItemIDMin); return true; @@ -2958,13 +2970,13 @@ DWORD CClientManager::GetItemID() return m_itemRange.dwUsableItemIDMin; } // ITEM_UNIQUE_ID_END -//BOOT_LOCALIZATION +// BOOT_LOCALIZATION -bool CClientManager::InitializeLocalization() +bool CClientManager::InitializeLocalization() { - char szQuery[512]; + char szQuery[512]; snprintf(szQuery, sizeof(szQuery), "SELECT mValue, mKey FROM locale"); - SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_COMMON); + SQLMsg *pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_COMMON); if (pMsg->Get()->uiNumRows == 0) { @@ -2987,18 +2999,18 @@ bool CClientManager::InitializeLocalization() strlcpy(locale.szValue, row[col++], sizeof(locale.szValue)); strlcpy(locale.szKey, row[col++], sizeof(locale.szKey)); - //DB_NAME_COLUMN Setting + // DB_NAME_COLUMN Setting if (strcmp(locale.szKey, "LOCALE") == 0) { - if (strcmp(locale.szValue, "cibn") == 0) + if (strcmp(locale.szValue, "cibn") == 0) { SPDLOG_DEBUG("locale[LOCALE] = {}", locale.szValue); if (g_stLocale != locale.szValue) SPDLOG_DEBUG("Changed g_stLocale {} to {}", g_stLocale.c_str(), "gb2312"); - g_stLocale = "gb2312"; - g_stLocaleNameColumn = "gb2312name"; + g_stLocale = "gb2312"; + g_stLocaleNameColumn = "gb2312name"; } else if (strcmp(locale.szValue, "ymir") == 0) { @@ -3008,8 +3020,8 @@ bool CClientManager::InitializeLocalization() SPDLOG_DEBUG("Changed g_stLocale {} to {}", g_stLocale.c_str(), "euckr"); g_stLocale = "euckr"; - g_stLocaleNameColumn = "name"; - } + g_stLocaleNameColumn = "name"; + } else if (strcmp(locale.szValue, "japan") == 0) { SPDLOG_DEBUG("locale[LOCALE] = {}", locale.szValue); @@ -3017,8 +3029,8 @@ bool CClientManager::InitializeLocalization() if (g_stLocale != locale.szValue) SPDLOG_DEBUG("Changed g_stLocale {} to {}", g_stLocale.c_str(), "sjis"); - g_stLocale = "sjis"; - g_stLocaleNameColumn = "locale_name"; + g_stLocale = "sjis"; + g_stLocaleNameColumn = "locale_name"; } else if (strcmp(locale.szValue, "english") == 0) { @@ -3340,31 +3352,31 @@ bool CClientManager::InitializeLocalization() else if (strcmp(locale.szKey, "DB_NAME_COLUMN") == 0) { SPDLOG_DEBUG("locale[DB_NAME_COLUMN] = {}", locale.szValue); - g_stLocaleNameColumn = locale.szValue; + g_stLocaleNameColumn = locale.szValue; } else { SPDLOG_DEBUG("locale[UNKNOWN_KEY({})] = {}", locale.szKey, locale.szValue); } m_vec_Locale.push_back(locale); - } + } delete pMsg; return true; } -//END_BOOT_LOCALIZATION -//ADMIN_MANAGER +// END_BOOT_LOCALIZATION +// ADMIN_MANAGER -bool CClientManager::__GetAdminInfo(const char *szIP, std::vector & rAdminVec) +bool CClientManager::__GetAdminInfo(const char *szIP, std::vector &rAdminVec) { - //szIP == NULL 일경우 모든서버에 운영자 권한을 갖는다. + // szIP == NULL 일경우 모든서버에 운영자 권한을 갖는다. char szQuery[512]; snprintf(szQuery, sizeof(szQuery), - "SELECT mID,mAccount,mName,mContactIP,mServerIP,mAuthority FROM gmlist WHERE mServerIP='ALL' or mServerIP='%s'", - szIP ? szIP : "ALL"); + "SELECT mID,mAccount,mName,mContactIP,mServerIP,mAuthority FROM gmlist WHERE mServerIP='ALL' or mServerIP='%s'", + szIP ? szIP : "ALL"); - SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_COMMON); + SQLMsg *pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_COMMON); if (pMsg->Get()->uiNumRows == 0) { @@ -3391,20 +3403,20 @@ bool CClientManager::__GetAdminInfo(const char *szIP, std::vector & if (!stAuth.compare("IMPLEMENTOR")) Info.m_Authority = GM_IMPLEMENTOR; else if (!stAuth.compare("GOD")) - Info.m_Authority = GM_GOD; + Info.m_Authority = GM_GOD; else if (!stAuth.compare("HIGH_WIZARD")) Info.m_Authority = GM_HIGH_WIZARD; - else if (!stAuth.compare("LOW_WIZARD")) + else if (!stAuth.compare("LOW_WIZARD")) Info.m_Authority = GM_LOW_WIZARD; else if (!stAuth.compare("WIZARD")) Info.m_Authority = GM_WIZARD; - else + else continue; rAdminVec.push_back(Info); SPDLOG_DEBUG("GM: PID {} Login {} Character {} ContactIP {} ServerIP {} Authority {}[{}]", - Info.m_ID, Info.m_szAccount, Info.m_szName, Info.m_szContactIP, Info.m_szServerIP, Info.m_Authority, stAuth.c_str()); + Info.m_ID, Info.m_szAccount, Info.m_szName, Info.m_szContactIP, Info.m_szServerIP, Info.m_Authority, stAuth.c_str()); } delete pMsg; @@ -3412,11 +3424,11 @@ bool CClientManager::__GetAdminInfo(const char *szIP, std::vector & return true; } -bool CClientManager::__GetHostInfo(std::vector & rIPVec) +bool CClientManager::__GetHostInfo(std::vector &rIPVec) { char szQuery[512]; snprintf(szQuery, sizeof(szQuery), "SELECT mIP FROM gmhost"); - SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_COMMON); + SQLMsg *pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_COMMON); if (pMsg->Get()->uiNumRows == 0) { @@ -3427,7 +3439,7 @@ bool CClientManager::__GetHostInfo(std::vector & rIPVec) rIPVec.reserve(pMsg->Get()->uiNumRows); - MYSQL_ROW row; + MYSQL_ROW row; while ((row = mysql_fetch_row(pMsg->Get()->pSQLResult))) { @@ -3441,22 +3453,22 @@ bool CClientManager::__GetHostInfo(std::vector & rIPVec) delete pMsg; return true; } -//END_ADMIN_MANAGER +// END_ADMIN_MANAGER -void CClientManager::ReloadAdmin(CPeer*, TPacketReloadAdmin* p) +void CClientManager::ReloadAdmin(CPeer *, TPacketReloadAdmin *p) { std::vector vAdmin; std::vector vHost; - + __GetHostInfo(vHost); __GetAdminInfo(p->szIP, vAdmin); - DWORD dwPacketSize = sizeof(WORD) + sizeof (WORD) + sizeof(tAdminInfo) * vAdmin.size() + - sizeof(WORD) + sizeof(WORD) + 16 * vHost.size(); + DWORD dwPacketSize = sizeof(WORD) + sizeof(WORD) + sizeof(tAdminInfo) * vAdmin.size() + + sizeof(WORD) + sizeof(WORD) + 16 * vHost.size(); for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it) { - CPeer * peer = *it; + CPeer *peer = *it; if (!peer->GetChannel()) continue; @@ -3479,21 +3491,21 @@ void CClientManager::ReloadAdmin(CPeer*, TPacketReloadAdmin* p) SPDLOG_DEBUG("ReloadAdmin End {}", p->szIP); } -//BREAK_MARRIAGE -void CClientManager::BreakMarriage(CPeer * peer, const char * data) +// BREAK_MARRIAGE +void CClientManager::BreakMarriage(CPeer *peer, const char *data) { DWORD pid1, pid2; - pid1 = *(int *) data; + pid1 = *(int *)data; data += sizeof(int); - pid2 = *(int *) data; + pid2 = *(int *)data; data += sizeof(int); SPDLOG_DEBUG("Breaking off a marriage engagement! pid {} and pid {}", pid1, pid2); marriage::CManager::instance().Remove(pid1, pid2); } -//END_BREAK_MARIIAGE +// END_BREAK_MARIIAGE void CClientManager::UpdateItemCacheSet(DWORD pid) { @@ -3505,27 +3517,27 @@ void CClientManager::UpdateItemCacheSet(DWORD pid) return; } - TItemCacheSet * pSet = it->second; + TItemCacheSet *pSet = it->second; TItemCacheSet::iterator it_set = pSet->begin(); while (it_set != pSet->end()) { - CItemCache * c = *it_set++; + CItemCache *c = *it_set++; c->Flush(); } - SPDLOG_TRACE("UPDATE_ITEMCACHESET : UpdateItemCachsSet pid({})", pid); + SPDLOG_TRACE("UPDATE_ITEMCACHESET : UpdateItemCachsSet pid({})", pid); } -void CClientManager::Election(CPeer * peer, DWORD dwHandle, const char* data) +void CClientManager::Election(CPeer *peer, DWORD dwHandle, const char *data) { DWORD idx; DWORD selectingpid; - idx = *(DWORD *) data; + idx = *(DWORD *)data; data += sizeof(DWORD); - selectingpid = *(DWORD *) data; + selectingpid = *(DWORD *)data; data += sizeof(DWORD); int Success = 0; @@ -3544,13 +3556,12 @@ 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) +void CClientManager::Candidacy(CPeer *peer, DWORD dwHandle, const char *data) { DWORD pid; - pid = *(DWORD *) data; + pid = *(DWORD *)data; data += sizeof(DWORD); if (!CMonarch::instance().AddCandidacy(pid, data)) @@ -3568,7 +3579,7 @@ void CClientManager::Candidacy(CPeer * peer, DWORD dwHandle, const char* data) for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it) { - CPeer * p = *it; + CPeer *p = *it; if (!p->GetChannel()) continue; @@ -3577,7 +3588,7 @@ void CClientManager::Candidacy(CPeer * peer, DWORD dwHandle, const char* data) continue; if (p == peer) - { + { p->EncodeHeader(HEADER_DG_CANDIDACY, dwHandle, sizeof(int) + 32); p->Encode(&pid, sizeof(int)); p->Encode(data, 32); @@ -3592,27 +3603,27 @@ void CClientManager::Candidacy(CPeer * peer, DWORD dwHandle, const char* data) } } -void CClientManager::AddMonarchMoney(CPeer * peer, DWORD dwHandle, const char * data) +void CClientManager::AddMonarchMoney(CPeer *peer, DWORD dwHandle, const char *data) { - int Empire = *(int *) data; + int Empire = *(int *)data; data += sizeof(int); - int Money = *(int *) data; + int Money = *(int *)data; data += sizeof(int); SPDLOG_TRACE("[MONARCH] Add money Empire({}) Money({})", Empire, Money); CMonarch::instance().AddMoney(Empire, Money); - + for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it) { - CPeer * p = *it; + CPeer *p = *it; if (!p->GetChannel()) continue; if (p == peer) - { + { p->EncodeHeader(HEADER_DG_ADD_MONARCH_MONEY, dwHandle, sizeof(int) + sizeof(int)); p->Encode(&Empire, sizeof(int)); p->Encode(&Money, sizeof(int)); @@ -3623,30 +3634,29 @@ 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) +void CClientManager::DecMonarchMoney(CPeer *peer, DWORD dwHandle, const char *data) { - int Empire = *(int *) data; + int Empire = *(int *)data; data += sizeof(int); - int Money = *(int *) data; + int Money = *(int *)data; data += sizeof(int); - + SPDLOG_TRACE("[MONARCH] Dec money Empire({}) Money({})", Empire, Money); CMonarch::instance().DecMoney(Empire, Money); - + for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it) { - CPeer * p = *it; + CPeer *p = *it; if (!p->GetChannel()) continue; if (p == peer) - { + { p->EncodeHeader(HEADER_DG_DEC_MONARCH_MONEY, dwHandle, sizeof(int) + sizeof(int)); p->Encode(&Empire, sizeof(int)); p->Encode(&Money, sizeof(int)); @@ -3660,19 +3670,20 @@ void CClientManager::DecMonarchMoney(CPeer * peer, DWORD dwHandle, const char * } } -void CClientManager::TakeMonarchMoney(CPeer * peer, DWORD dwHandle, const char * data) +void CClientManager::TakeMonarchMoney(CPeer *peer, DWORD dwHandle, const char *data) { - int Empire = *(int *) data; + int Empire = *(int *)data; data += sizeof(int); - DWORD pid = *(DWORD *) data; + DWORD pid = *(DWORD *)data; data += sizeof(int); - int Money = *(int *) data; + int Money = *(int *)data; data += sizeof(int); 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)); @@ -3688,12 +3699,12 @@ void CClientManager::TakeMonarchMoney(CPeer * peer, DWORD dwHandle, const char * } } -void CClientManager::ComeToVote(CPeer * peer, DWORD dwHandle, const char * data) +void CClientManager::ComeToVote(CPeer *peer, DWORD dwHandle, const char *data) { - CMonarch::instance().ElectMonarch(); + CMonarch::instance().ElectMonarch(); } -void CClientManager::RMCandidacy(CPeer * peer, DWORD dwHandle, const char * data) +void CClientManager::RMCandidacy(CPeer *peer, DWORD dwHandle, const char *data) { char szName[32]; @@ -3706,7 +3717,7 @@ void CClientManager::RMCandidacy(CPeer * peer, DWORD dwHandle, const char * data { for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it) { - CPeer * p = *it; + CPeer *p = *it; if (!p->GetChannel()) continue; @@ -3727,28 +3738,28 @@ void CClientManager::RMCandidacy(CPeer * peer, DWORD dwHandle, const char * data } else { - CPeer * p = peer; + CPeer *p = peer; p->EncodeHeader(HEADER_DG_RMCANDIDACY, dwHandle, sizeof(int) + sizeof(szName)); p->Encode(&iRet, sizeof(int)); p->Encode(szName, sizeof(szName)); } } -void CClientManager::SetMonarch(CPeer * peer, DWORD dwHandle, const char * data) +void CClientManager::SetMonarch(CPeer *peer, DWORD dwHandle, const char *data) { char szName[32]; strlcpy(szName, data, sizeof(szName)); SPDLOG_TRACE("[MONARCH_GM] Set Monarch name({})", szName); - + int iRet = CMonarch::instance().SetMonarch(szName) ? 1 : 0; if (1 == iRet) { for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it) { - CPeer * p = *it; + CPeer *p = *it; if (!p->GetChannel()) continue; @@ -3769,30 +3780,30 @@ void CClientManager::SetMonarch(CPeer * peer, DWORD dwHandle, const char * data) } else { - CPeer * p = peer; + CPeer *p = peer; p->EncodeHeader(HEADER_DG_RMCANDIDACY, dwHandle, sizeof(int) + sizeof(szName)); p->Encode(&iRet, sizeof(int)); p->Encode(szName, sizeof(szName)); } } -void CClientManager::RMMonarch(CPeer * peer, DWORD dwHandle, const char * data) +void CClientManager::RMMonarch(CPeer *peer, DWORD dwHandle, const char *data) { char szName[32]; strlcpy(szName, data, sizeof(szName)); - + SPDLOG_TRACE("[MONARCH_GM] Remove Monarch name({})", szName); - + CMonarch::instance().DelMonarch(szName); - + int iRet = CMonarch::instance().DelMonarch(szName) ? 1 : 0; if (1 == iRet) { for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); ++it) { - CPeer * p = *it; + CPeer *p = *it; if (!p->GetChannel()) continue; @@ -3813,46 +3824,46 @@ void CClientManager::RMMonarch(CPeer * peer, DWORD dwHandle, const char * data) } else { - CPeer * p = peer; + CPeer *p = peer; p->EncodeHeader(HEADER_DG_RMCANDIDACY, dwHandle, sizeof(int) + sizeof(szName)); p->Encode(&iRet, sizeof(int)); p->Encode(szName, sizeof(szName)); } } -void CClientManager::ChangeMonarchLord(CPeer * peer, DWORD dwHandle, TPacketChangeMonarchLord* info) +void CClientManager::ChangeMonarchLord(CPeer *peer, DWORD dwHandle, TPacketChangeMonarchLord *info) { char szQuery[1024]; - snprintf(szQuery, sizeof(szQuery), - "SELECT a.name, NOW() FROM player%s AS a, player_index%s AS b WHERE (a.account_id=b.id AND a.id=%u AND b.empire=%u) AND " - "(b.pid1=%u OR b.pid2=%u OR b.pid3=%u OR b.pid4=%u)", - GetTablePostfix(), GetTablePostfix(), info->dwPID, info->bEmpire, - info->dwPID, info->dwPID, info->dwPID, info->dwPID); + snprintf(szQuery, sizeof(szQuery), + "SELECT a.name, NOW() FROM player%s AS a, player_index%s AS b WHERE (a.account_id=b.id AND a.id=%u AND b.empire=%u) AND " + "(b.pid1=%u OR b.pid2=%u OR b.pid3=%u OR b.pid4=%u)", + GetTablePostfix(), GetTablePostfix(), info->dwPID, info->bEmpire, + info->dwPID, info->dwPID, info->dwPID, info->dwPID); - SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER); + SQLMsg *pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER); if (pMsg->Get()->uiNumRows != 0) { TPacketChangeMonarchLordACK ack; ack.bEmpire = info->bEmpire; ack.dwPID = info->dwPID; - + MYSQL_ROW row = mysql_fetch_row(pMsg->Get()->pSQLResult); strlcpy(ack.szName, row[0], sizeof(ack.szName)); strlcpy(ack.szDate, row[1], sizeof(ack.szDate)); - + snprintf(szQuery, sizeof(szQuery), "UPDATE monarch SET pid=%u, windate=NOW() WHERE empire=%d", ack.dwPID, ack.bEmpire); - SQLMsg* pMsg2 = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER); + SQLMsg *pMsg2 = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER); if (pMsg2->Get()->uiAffectedRows > 0) { CMonarch::instance().LoadMonarch(); - TMonarchInfo* newInfo = CMonarch::instance().GetMonarch(); + TMonarchInfo *newInfo = CMonarch::instance().GetMonarch(); for (itertype(m_peerList) it = m_peerList.begin(); it != m_peerList.end(); it++) { - CPeer* client = *it; + CPeer *client = *it; client->EncodeHeader(HEADER_DG_CHANGE_MONARCH_LORD_ACK, 0, sizeof(TPacketChangeMonarchLordACK)); client->Encode(&ack, sizeof(TPacketChangeMonarchLordACK)); @@ -3868,17 +3879,17 @@ void CClientManager::ChangeMonarchLord(CPeer * peer, DWORD dwHandle, TPacketChan delete pMsg; } -void CClientManager::SendSpareItemIDRange(CPeer* peer) +void CClientManager::SendSpareItemIDRange(CPeer *peer) { peer->SendSpareItemIDRange(); } // // Login Key만 맵에서 지운다. -// +// void CClientManager::DeleteLoginKey(TPacketDC *data) { - char login[LOGIN_MAX_LEN+1] = {0}; + char login[LOGIN_MAX_LEN + 1] = {0}; trim_and_lower(data->login, login, sizeof(login)); CLoginData *pkLD = GetLoginDataByLogin(login); @@ -3895,70 +3906,72 @@ void CClientManager::DeleteLoginKey(TPacketDC *data) // delete gift notify icon void CClientManager::DeleteAwardId(TPacketDeleteAwardID *data) { - //SPDLOG_DEBUG("data from game server arrived {}", data->dwID); + // SPDLOG_DEBUG("data from game server arrived {}", data->dwID); std::map::iterator it; it = ItemAwardManager::Instance().GetMapAward().find(data->dwID); - if ( it != ItemAwardManager::Instance().GetMapAward().end() ) + if (it != ItemAwardManager::Instance().GetMapAward().end()) { - std::set & kSet = ItemAwardManager::Instance().GetMapkSetAwardByLogin()[it->second->szLogin]; - if(kSet.erase(it->second)) + std::set &kSet = ItemAwardManager::Instance().GetMapkSetAwardByLogin()[it->second->szLogin]; + if (kSet.erase(it->second)) SPDLOG_DEBUG("erase ItemAward id: {} from cache", data->dwID); ItemAwardManager::Instance().GetMapAward().erase(data->dwID); } else { - SPDLOG_DEBUG("DELETE_AWARDID : could not find the id: {}", data->dwID); + SPDLOG_DEBUG("DELETE_AWARDID : could not find the id: {}", data->dwID); } - } -void CClientManager::UpdateChannelStatus(TChannelStatus* pData) +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)); } } -void CClientManager::RequestChannelStatus(CPeer* peer, DWORD dwHandle) +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->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)); } } -void CClientManager::ResetLastPlayerID(const TPacketNeedLoginLogInfo* data) +void CClientManager::ResetLastPlayerID(const TPacketNeedLoginLogInfo *data) { - CLoginData* pkLD = GetLoginDataByAID( data->dwPlayerID ); + CLoginData *pkLD = GetLoginDataByAID(data->dwPlayerID); if (NULL != pkLD) { - pkLD->SetLastPlayerID( 0 ); + pkLD->SetLastPlayerID(0); } } -void CClientManager::ChargeCash(const TRequestChargeCash* packet) +void CClientManager::ChargeCash(const TRequestChargeCash *packet) { char szQuery[512]; if (ERequestCharge_Cash == packet->eChargeType) sprintf(szQuery, "update account set `cash` = `cash` + %d where id = %d limit 1", packet->dwAmount, packet->dwAID); - else if(ERequestCharge_Mileage == packet->eChargeType) + else if (ERequestCharge_Mileage == packet->eChargeType) sprintf(szQuery, "update account set `mileage` = `mileage` + %d where id = %d limit 1", packet->dwAmount, packet->dwAID); else { - SPDLOG_ERROR("Invalid request charge type (type : {}, amount : {}, aid : {})", (int) packet->eChargeType, packet->dwAmount, packet->dwAID); + SPDLOG_ERROR("Invalid request charge type (type : {}, amount : {}, aid : {})", (int)packet->eChargeType, packet->dwAmount, packet->dwAID); return; } - SPDLOG_ERROR("Request Charge (type : {}, amount : {}, aid : {})", (int) packet->eChargeType, packet->dwAmount, packet->dwAID); + SPDLOG_ERROR("Request Charge (type : {}, amount : {}, aid : {})", (int)packet->eChargeType, packet->dwAmount, packet->dwAID); CDBManager::Instance().AsyncQuery(szQuery, SQL_ACCOUNT); } diff --git a/src/db/src/ClientManager.h b/src/db/src/ClientManager.h index 8690764..c5fcf58 100644 --- a/src/db/src/ClientManager.h +++ b/src/db/src/ClientManager.h @@ -20,14 +20,14 @@ class CItemPriceListTableCache; class CPacketInfo { - public: +public: void Add(int header); void Reset(); std::map m_map_info; }; -size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * pkTab); +size_t CreatePlayerSaveQuery(char *pszQuery, size_t querySize, TPlayerTable *pkTab); static void AcceptConnection(evconnlistener *listener, evutil_socket_t fd, sockaddr *address, int socklen, void *ctx); static void AcceptError(evconnlistener *listener, void *ctx); @@ -37,13 +37,13 @@ static void DescEventHandler(bufferevent *bev, short events, void *ctx); class CClientManager : public singleton { - public: - typedef std::list TPeerList; +public: + typedef std::list TPeerList; typedef std::unordered_map TPlayerTableCacheMap; typedef std::unordered_map TItemCacheMap; - typedef std::unordered_set > TItemCacheSet; + typedef std::unordered_set> TItemCacheSet; typedef std::unordered_map TItemCacheSetPtrMap; - typedef std::unordered_map TItemPriceListCacheMap; + typedef std::unordered_map TItemPriceListCacheMap; typedef std::unordered_map TChannelStatusMap; // MYSHOP_PRICE_LIST @@ -52,43 +52,43 @@ class CClientManager : public singleton * first: Peer handle * second: 요청한 플레이어의 ID */ - typedef std::pair< DWORD, DWORD > TItemPricelistReqInfo; + typedef std::pair TItemPricelistReqInfo; // END_OF_MYSHOP_PRICE_LIST class ClientHandleInfo { - public: - DWORD dwHandle; - DWORD account_id; - DWORD player_id; - BYTE account_index; - char login[LOGIN_MAX_LEN + 1]; - char safebox_password[SAFEBOX_PASSWORD_MAX_LEN + 1]; - char ip[MAX_HOST_LENGTH + 1]; + public: + DWORD dwHandle; + DWORD account_id; + DWORD player_id; + BYTE account_index; + char login[LOGIN_MAX_LEN + 1]; + char safebox_password[SAFEBOX_PASSWORD_MAX_LEN + 1]; + char ip[MAX_HOST_LENGTH + 1]; - TAccountTable * pAccountTable; - TSafeboxTable * pSafebox; + TAccountTable *pAccountTable; + TSafeboxTable *pSafebox; ClientHandleInfo(DWORD argHandle, DWORD dwPID = 0) { - dwHandle = argHandle; - pSafebox = NULL; - pAccountTable = NULL; - player_id = dwPID; + dwHandle = argHandle; + pSafebox = NULL; + pAccountTable = NULL; + player_id = dwPID; }; - //독일선물기능용 생성자 + // 독일선물기능용 생성자 ClientHandleInfo(DWORD argHandle, DWORD dwPID, DWORD accountId) { - dwHandle = argHandle; - pSafebox = NULL; - pAccountTable = NULL; - player_id = dwPID; + dwHandle = argHandle; + pSafebox = NULL; + pAccountTable = NULL; + player_id = dwPID; account_id = accountId; }; ~ClientHandleInfo() { - if (pSafebox) + if (pSafebox) { delete pSafebox; pSafebox = NULL; @@ -96,43 +96,43 @@ class CClientManager : public singleton } }; - public: +public: CClientManager(); ~CClientManager(); - bool Initialize(); - time_t GetCurrentTime(); + bool Initialize(); + time_t GetCurrentTime(); - void MainLoop(); - void Quit(); + void MainLoop(); + void Quit(); - void SetTablePostfix(const char* c_pszTablePostfix); - void SetPlayerIDStart(int iIDStart); - int GetPlayerIDStart() { return m_iPlayerIDStart; } + void SetTablePostfix(const char *c_pszTablePostfix); + void SetPlayerIDStart(int iIDStart); + int GetPlayerIDStart() { return m_iPlayerIDStart; } - int GetPlayerDeleteLevelLimit() { return m_iPlayerDeleteLevelLimit; } + int GetPlayerDeleteLevelLimit() { return m_iPlayerDeleteLevelLimit; } - void SetChinaEventServer(bool flag) { m_bChinaEventServer = flag; } - bool IsChinaEventServer() { return m_bChinaEventServer; } + void SetChinaEventServer(bool flag) { m_bChinaEventServer = flag; } + bool IsChinaEventServer() { return m_bChinaEventServer; } - DWORD GetUserCount(); // 접속된 사용자 수를 리턴 한다. + DWORD GetUserCount(); // 접속된 사용자 수를 리턴 한다. - void SendAllGuildSkillRechargePacket(); - void SendTime(); + void SendAllGuildSkillRechargePacket(); + void SendTime(); - CPlayerTableCache * GetPlayerCache(DWORD id); - void PutPlayerCache(TPlayerTable * pNew); + CPlayerTableCache *GetPlayerCache(DWORD id); + void PutPlayerCache(TPlayerTable *pNew); - void CreateItemCacheSet(DWORD dwID); - TItemCacheSet * GetItemCacheSet(DWORD dwID); - void FlushItemCacheSet(DWORD dwID); + void CreateItemCacheSet(DWORD dwID); + TItemCacheSet *GetItemCacheSet(DWORD dwID); + void FlushItemCacheSet(DWORD dwID); - CItemCache * GetItemCache(DWORD id); - void PutItemCache(TPlayerItem * pNew, bool bSkipQuery = false); - bool DeleteItemCache(DWORD id); + CItemCache *GetItemCache(DWORD id); + void PutItemCache(TPlayerItem *pNew, bool bSkipQuery = false); + bool DeleteItemCache(DWORD id); - void UpdatePlayerCache(); - void UpdateItemCache(); + void UpdatePlayerCache(); + void UpdateItemCache(); // MYSHOP_PRICE_LIST /// 가격정보 리스트 캐시를 가져온다. @@ -140,7 +140,7 @@ class CClientManager : public singleton * @param [in] dwID 가격정보 리스트의 소유자.(플레이어 ID) * @return 가격정보 리스트 캐시의 포인터 */ - CItemPriceListTableCache* GetItemPriceListCache(DWORD dwID); + CItemPriceListTableCache *GetItemPriceListCache(DWORD dwID); /// 가격정보 리스트 캐시를 넣는다. /** @@ -148,116 +148,114 @@ class CClientManager : public singleton * * 캐시가 이미 있으면 Update 가 아닌 replace 한다. */ - void PutItemPriceListCache(const TItemPriceListTable* pItemPriceList); - + void PutItemPriceListCache(const TItemPriceListTable *pItemPriceList); /// Flush 시간이 만료된 아이템 가격정보 리스트 캐시를 Flush 해주고 캐시에서 삭제한다. - void UpdateItemPriceListCache(void); + void UpdateItemPriceListCache(void); // END_OF_MYSHOP_PRICE_LIST + void SendGuildSkillUsable(DWORD guild_id, DWORD dwSkillVnum, bool bUsable); - void SendGuildSkillUsable(DWORD guild_id, DWORD dwSkillVnum, bool bUsable); - - void SetCacheFlushCountLimit(int iLimit); + void SetCacheFlushCountLimit(int iLimit); template - Func for_each_peer(Func f); + Func for_each_peer(Func f); - CPeer * GetAnyPeer(); + CPeer *GetAnyPeer(); - void ForwardPacket(BYTE header, const void* data, int size, BYTE bChannel = 0, CPeer * except = NULL); + void ForwardPacket(BYTE header, const void *data, int size, BYTE bChannel = 0, CPeer *except = NULL); - void SendNotice(const char * c_pszFormat, ...); + void SendNotice(const char *c_pszFormat, ...); - std::string GetCommand(char* str); //독일선물기능에서 명령어 얻는 함수 - void ItemAward(CPeer * peer, char* login); //독일 선물 기능 + std::string GetCommand(char *str); // 독일선물기능에서 명령어 얻는 함수 + void ItemAward(CPeer *peer, char *login); // 독일 선물 기능 - CPeer * AddPeer(bufferevent* bufev, sockaddr* addr); - void RemovePeer(CPeer * pPeer); - CPeer * GetPeer(IDENT ident); - CPeer * GetAuthPeer(); + CPeer *AddPeer(bufferevent *bufev, sockaddr *addr); + void RemovePeer(CPeer *pPeer); + CPeer *GetPeer(IDENT ident); + CPeer *GetAuthPeer(); - void ProcessPackets(CPeer * peer); + void ProcessPackets(CPeer *peer); - protected: - void Destroy(); +protected: + void Destroy(); - private: - bool InitializeTables(); - bool InitializeShopTable(); - bool InitializeMobTable(); - bool InitializeItemTable(); - bool InitializeQuestItemTable(); - bool InitializeSkillTable(); - bool InitializeRefineTable(); - bool InitializeBanwordTable(); - bool InitializeItemAttrTable(); - bool InitializeItemRareTable(); - bool InitializeLandTable(); - bool InitializeObjectProto(); - bool InitializeObjectTable(); - bool InitializeMonarch(); +private: + bool InitializeTables(); + bool InitializeShopTable(); + bool InitializeMobTable(); + bool InitializeItemTable(); + bool InitializeQuestItemTable(); + bool InitializeSkillTable(); + bool InitializeRefineTable(); + bool InitializeBanwordTable(); + bool InitializeItemAttrTable(); + bool InitializeItemRareTable(); + bool InitializeLandTable(); + bool InitializeObjectProto(); + bool InitializeObjectTable(); + bool InitializeMonarch(); // mob_proto.txt, item_proto.txt에서 읽은 mob_proto, item_proto를 real db에 반영. // item_proto, mob_proto를 db에 반영하지 않아도, 게임 돌아가는데는 문제가 없지만, // 운영툴 등에서 db의 item_proto, mob_proto를 읽어 쓰기 때문에 문제가 발생한다. - bool MirrorMobTableIntoDB(); - bool MirrorItemTableIntoDB(); + bool MirrorMobTableIntoDB(); + bool MirrorItemTableIntoDB(); - int AnalyzeQueryResult(SQLMsg * msg); - int AnalyzeErrorMsg(CPeer * peer, SQLMsg * msg); + int AnalyzeQueryResult(SQLMsg *msg); + int AnalyzeErrorMsg(CPeer *peer, SQLMsg *msg); - int Process(); + int Process(); - CLoginData * GetLoginData(DWORD dwKey); - CLoginData * GetLoginDataByLogin(const char * c_pszLogin); - CLoginData * GetLoginDataByAID(DWORD dwAID); + CLoginData *GetLoginData(DWORD dwKey); + CLoginData *GetLoginDataByLogin(const char *c_pszLogin); + CLoginData *GetLoginDataByAID(DWORD dwAID); - void InsertLoginData(CLoginData * pkLD); - void DeleteLoginData(CLoginData * pkLD); + void InsertLoginData(CLoginData *pkLD); + void DeleteLoginData(CLoginData *pkLD); - bool InsertLogonAccount(const char * c_pszLogin, DWORD dwHandle, const char * c_pszIP); - bool DeleteLogonAccount(const char * c_pszLogin, DWORD dwHandle); - bool FindLogonAccount(const char * c_pszLogin); + bool InsertLogonAccount(const char *c_pszLogin, DWORD dwHandle, const char *c_pszIP); + bool DeleteLogonAccount(const char *c_pszLogin, DWORD dwHandle); + bool FindLogonAccount(const char *c_pszLogin); - void GuildCreate(CPeer * peer, DWORD dwGuildID); - void GuildSkillUpdate(CPeer * peer, TPacketGuildSkillUpdate* p); - void GuildExpUpdate(CPeer * peer, TPacketGuildExpUpdate* p); - void GuildAddMember(CPeer * peer, TPacketGDGuildAddMember* p); - void GuildChangeGrade(CPeer * peer, TPacketGuild* p); - void GuildRemoveMember(CPeer * peer, TPacketGuild* p); - void GuildChangeMemberData(CPeer * peer, TPacketGuildChangeMemberData* p); - void GuildDisband(CPeer * peer, TPacketGuild * p); - void GuildWar(CPeer * peer, TPacketGuildWar * p); - void GuildWarScore(CPeer * peer, TPacketGuildWarScore * p); - void GuildChangeLadderPoint(TPacketGuildLadderPoint* p); - void GuildUseSkill(TPacketGuildUseSkill* p); - void GuildDepositMoney(TPacketGDGuildMoney* p); - void GuildWithdrawMoney(CPeer* peer, TPacketGDGuildMoney* p); - void GuildWithdrawMoneyGiveReply(TPacketGDGuildMoneyWithdrawGiveReply* p); - void GuildWarBet(TPacketGDGuildWarBet * p); - void GuildChangeMaster(TPacketChangeGuildMaster* p); + void GuildCreate(CPeer *peer, DWORD dwGuildID); + void GuildSkillUpdate(CPeer *peer, TPacketGuildSkillUpdate *p); + void GuildExpUpdate(CPeer *peer, TPacketGuildExpUpdate *p); + void GuildAddMember(CPeer *peer, TPacketGDGuildAddMember *p); + void GuildChangeGrade(CPeer *peer, TPacketGuild *p); + void GuildRemoveMember(CPeer *peer, TPacketGuild *p); + void GuildChangeMemberData(CPeer *peer, TPacketGuildChangeMemberData *p); + void GuildDisband(CPeer *peer, TPacketGuild *p); + void GuildWar(CPeer *peer, TPacketGuildWar *p); + void GuildWarScore(CPeer *peer, TPacketGuildWarScore *p); + void GuildChangeLadderPoint(TPacketGuildLadderPoint *p); + void GuildUseSkill(TPacketGuildUseSkill *p); + void GuildDepositMoney(TPacketGDGuildMoney *p); + void GuildWithdrawMoney(CPeer *peer, TPacketGDGuildMoney *p); + void GuildWithdrawMoneyGiveReply(TPacketGDGuildMoneyWithdrawGiveReply *p); + void GuildWarBet(TPacketGDGuildWarBet *p); + void GuildChangeMaster(TPacketChangeGuildMaster *p); - void SetGuildWarEndTime(DWORD guild_id1, DWORD guild_id2, time_t tEndTime); + void SetGuildWarEndTime(DWORD guild_id1, DWORD guild_id2, time_t tEndTime); - void QUERY_BOOT(CPeer * peer, TPacketGDBoot * p); + void QUERY_BOOT(CPeer *peer, TPacketGDBoot *p); - void QUERY_LOGIN(CPeer * peer, DWORD dwHandle, SLoginPacket* data); - void QUERY_LOGOUT(CPeer * peer, DWORD dwHandle, const char *); + void QUERY_LOGIN(CPeer *peer, DWORD dwHandle, SLoginPacket *data); + void QUERY_LOGOUT(CPeer *peer, DWORD dwHandle, const char *); - void RESULT_LOGIN(CPeer * peer, SQLMsg *msg); + void RESULT_LOGIN(CPeer *peer, SQLMsg *msg); - 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_ITEM_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwHandle, DWORD dwPID); - void RESULT_QUEST_LOAD(CPeer * pkPeer, MYSQL_RES * pRes, DWORD dwHandle, DWORD dwPID); - void RESULT_AFFECT_LOAD(CPeer * pkPeer, MYSQL_RES * pRes, DWORD dwHandle); + 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_ITEM_LOAD(CPeer *peer, MYSQL_RES *pRes, DWORD dwHandle, DWORD dwPID); + void RESULT_QUEST_LOAD(CPeer *pkPeer, MYSQL_RES *pRes, DWORD dwHandle, DWORD dwPID); + void RESULT_AFFECT_LOAD(CPeer *pkPeer, MYSQL_RES *pRes, DWORD dwHandle); // PLAYER_INDEX_CREATE_BUG_FIX - void RESULT_PLAYER_INDEX_CREATE(CPeer *pkPeer, SQLMsg *msg); + void RESULT_PLAYER_INDEX_CREATE(CPeer *pkPeer, SQLMsg *msg); // END_PLAYER_INDEX_CREATE_BUG_FIX - + // MYSHOP_PRICE_LIST /// 가격정보 로드 쿼리에 대한 Result 처리 /** @@ -266,7 +264,7 @@ class CClientManager : public singleton * * 로드된 가격정보 리스트를 캐시에 저장하고 peer 에게 리스트를 보내준다. */ - void RESULT_PRICELIST_LOAD(CPeer* peer, SQLMsg* pMsg); + void RESULT_PRICELIST_LOAD(CPeer *peer, SQLMsg *pMsg); /// 가격정보 업데이트를 위한 로드 쿼리에 대한 Result 처리 /** @@ -274,82 +272,81 @@ class CClientManager : public singleton * * 로드된 정보로 가격정보 리스트 캐시를 만들고 업데이트 받은 가격정보로 업데이트 한다. */ - void RESULT_PRICELIST_LOAD_FOR_UPDATE(SQLMsg* pMsg); + void RESULT_PRICELIST_LOAD_FOR_UPDATE(SQLMsg *pMsg); // END_OF_MYSHOP_PRICE_LIST - void QUERY_PLAYER_SAVE(CPeer * peer, DWORD dwHandle, TPlayerTable*); + void QUERY_PLAYER_SAVE(CPeer *peer, DWORD dwHandle, TPlayerTable *); - void __QUERY_PLAYER_CREATE(CPeer * peer, DWORD dwHandle, TPlayerCreatePacket *); - void __QUERY_PLAYER_DELETE(CPeer * peer, DWORD dwHandle, TPlayerDeletePacket *); - void __RESULT_PLAYER_DELETE(CPeer * peer, SQLMsg* msg); + void __QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerCreatePacket *); + void __QUERY_PLAYER_DELETE(CPeer *peer, DWORD dwHandle, TPlayerDeletePacket *); + void __RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg *msg); - void QUERY_PLAYER_COUNT(CPeer * pkPeer, TPlayerCountPacket *); + void QUERY_PLAYER_COUNT(CPeer *pkPeer, TPlayerCountPacket *); - void QUERY_ITEM_SAVE(CPeer * pkPeer, const char * c_pData); - void QUERY_ITEM_DESTROY(CPeer * pkPeer, const char * c_pData); - void QUERY_ITEM_FLUSH(CPeer * pkPeer, const char * c_pData); + void QUERY_ITEM_SAVE(CPeer *pkPeer, const char *c_pData); + 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); - 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); + void QUERY_SAFEBOX_LOAD(CPeer *pkPeer, DWORD dwHandle, TSafeboxLoadPacket *, bool bMall); + void QUERY_SAFEBOX_SAVE(CPeer *pkPeer, TSafeboxTable *pTable); + void QUERY_SAFEBOX_CHANGE_SIZE(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangeSizePacket *p); + void QUERY_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, DWORD dwHandle, TSafeboxChangePasswordPacket *p); - void QUERY_SAFEBOX_LOAD(CPeer * pkPeer, DWORD dwHandle, TSafeboxLoadPacket *, bool bMall); - void QUERY_SAFEBOX_SAVE(CPeer * pkPeer, TSafeboxTable * pTable); - 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_CHANGE_SIZE(CPeer *pkPeer, SQLMsg *msg); + void RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer *pkPeer, SQLMsg *msg); + void RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer *pkPeer, SQLMsg *msg); - void RESULT_SAFEBOX_LOAD(CPeer * pkPeer, SQLMsg * msg); - void RESULT_SAFEBOX_CHANGE_SIZE(CPeer * pkPeer, SQLMsg * msg); - void RESULT_SAFEBOX_CHANGE_PASSWORD(CPeer * pkPeer, SQLMsg * msg); - void RESULT_SAFEBOX_CHANGE_PASSWORD_SECOND(CPeer * pkPeer, SQLMsg * msg); + void QUERY_EMPIRE_SELECT(CPeer *pkPeer, DWORD dwHandle, TEmpireSelectPacket *p); + void QUERY_SETUP(CPeer *pkPeer, DWORD dwHandle, const char *c_pData); - void QUERY_EMPIRE_SELECT(CPeer * pkPeer, DWORD dwHandle, TEmpireSelectPacket * p); - void QUERY_SETUP(CPeer * pkPeer, DWORD dwHandle, const char * c_pData); + void SendPartyOnSetup(CPeer *peer); - void SendPartyOnSetup(CPeer * peer); + void QUERY_FLUSH_CACHE(CPeer *pkPeer, const char *c_pData); - void QUERY_FLUSH_CACHE(CPeer * pkPeer, const char * c_pData); + void QUERY_PARTY_CREATE(CPeer *peer, TPacketPartyCreate *p); + void QUERY_PARTY_DELETE(CPeer *peer, TPacketPartyDelete *p); + void QUERY_PARTY_ADD(CPeer *peer, TPacketPartyAdd *p); + void QUERY_PARTY_REMOVE(CPeer *peer, TPacketPartyRemove *p); + void QUERY_PARTY_STATE_CHANGE(CPeer *peer, TPacketPartyStateChange *p); + void QUERY_PARTY_SET_MEMBER_LEVEL(CPeer *peer, TPacketPartySetMemberLevel *p); - void QUERY_PARTY_CREATE(CPeer * peer, TPacketPartyCreate* p); - void QUERY_PARTY_DELETE(CPeer * peer, TPacketPartyDelete* p); - void QUERY_PARTY_ADD(CPeer * peer, TPacketPartyAdd* p); - void QUERY_PARTY_REMOVE(CPeer * peer, TPacketPartyRemove* p); - void QUERY_PARTY_STATE_CHANGE(CPeer * peer, TPacketPartyStateChange* p); - void QUERY_PARTY_SET_MEMBER_LEVEL(CPeer * peer, TPacketPartySetMemberLevel* p); + void QUERY_RELOAD_PROTO(); - void QUERY_RELOAD_PROTO(); + void QUERY_CHANGE_NAME(CPeer *peer, DWORD dwHandle, TPacketGDChangeName *p); + void GetPlayerFromRes(TPlayerTable *player_table, MYSQL_RES *res); - void QUERY_CHANGE_NAME(CPeer * peer, DWORD dwHandle, TPacketGDChangeName * p); - void GetPlayerFromRes(TPlayerTable * player_table, MYSQL_RES* res); + void QUERY_LOGIN_KEY(CPeer *pkPeer, TPacketGDLoginKey *p); - void QUERY_LOGIN_KEY(CPeer * pkPeer, TPacketGDLoginKey * p); + void AddGuildPriv(TPacketGiveGuildPriv *p); + void AddEmpirePriv(TPacketGiveEmpirePriv *p); + void AddCharacterPriv(TPacketGiveCharacterPriv *p); - void AddGuildPriv(TPacketGiveGuildPriv* p); - void AddEmpirePriv(TPacketGiveEmpirePriv* p); - void AddCharacterPriv(TPacketGiveCharacterPriv* p); + void MoneyLog(TPacketMoneyLog *p); - void MoneyLog(TPacketMoneyLog* p); + void QUERY_AUTH_LOGIN(CPeer *pkPeer, DWORD dwHandle, TPacketGDAuthLogin *p); - void QUERY_AUTH_LOGIN(CPeer * pkPeer, DWORD dwHandle, TPacketGDAuthLogin * p); + void QUERY_LOGIN_BY_KEY(CPeer *pkPeer, DWORD dwHandle, TPacketGDLoginByKey *p); + void RESULT_LOGIN_BY_KEY(CPeer *peer, SQLMsg *msg); - void QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketGDLoginByKey * p); - void RESULT_LOGIN_BY_KEY(CPeer * peer, SQLMsg * msg); + void ChargeCash(const TRequestChargeCash *p); - void ChargeCash(const TRequestChargeCash * p); - - void LoadEventFlag(); - void SetEventFlag(TPacketSetEventFlag* p); - void SendEventFlagsOnSetup(CPeer* peer); + void LoadEventFlag(); + void SetEventFlag(TPacketSetEventFlag *p); + void SendEventFlagsOnSetup(CPeer *peer); // 결혼 - void MarriageAdd(TPacketMarriageAdd * p); - void MarriageUpdate(TPacketMarriageUpdate * p); - void MarriageRemove(TPacketMarriageRemove * p); + void MarriageAdd(TPacketMarriageAdd *p); + void MarriageUpdate(TPacketMarriageUpdate *p); + void MarriageRemove(TPacketMarriageRemove *p); - void WeddingRequest(TPacketWeddingRequest * p); - void WeddingReady(TPacketWeddingReady * p); - void WeddingEnd(TPacketWeddingEnd * p); + void WeddingRequest(TPacketWeddingRequest *p); + void WeddingReady(TPacketWeddingReady *p); + void WeddingEnd(TPacketWeddingEnd *p); // MYSHOP_PRICE_LIST // 개인상점 가격정보 @@ -358,7 +355,7 @@ class CClientManager : public singleton /** * @param [in] pPacket 패킷 데이터의 포인터 */ - void MyshopPricelistUpdate(const TPacketMyshopPricelistHeader* pPacket); + void MyshopPricelistUpdate(const TPacketMyshopPricelistHeader *pPacket); /// 아이템 가격정보 리스트 요청 패킷(HEADER_GD_MYSHOP_PRICELIST_REQ) 처리함수 /** @@ -366,146 +363,145 @@ class CClientManager : public singleton * @param [in] dwHandle 가격정보를 요청한 peer 의 핸들 * @param [in] dwPlayerID 가격정보 리스트를 요청한 플레이어의 ID */ - void MyshopPricelistRequest(CPeer* peer, DWORD dwHandle, DWORD dwPlayerID); + void MyshopPricelistRequest(CPeer *peer, DWORD dwHandle, DWORD dwPlayerID); // END_OF_MYSHOP_PRICE_LIST // Building - void CreateObject(TPacketGDCreateObject * p); - void DeleteObject(DWORD dwID); - void UpdateLand(DWORD * pdw); + void CreateObject(TPacketGDCreateObject *p); + void DeleteObject(DWORD dwID); + void UpdateLand(DWORD *pdw); // BLOCK_CHAT - void BlockChat(TPacketBlockChat * p); + void BlockChat(TPacketBlockChat *p); // END_OF_BLOCK_CHAT - - private: - int m_looping; - event_base * m_base = nullptr; - evconnlistener * m_listener = nullptr; - TPeerList m_peerList; - CPeer * m_pkAuthPeer; +private: + int m_looping; + event_base *m_base = nullptr; + evconnlistener *m_listener = nullptr; + TPeerList m_peerList; + + CPeer *m_pkAuthPeer; // LoginKey, LoginData pair typedef std::unordered_map TLoginDataByLoginKey; - TLoginDataByLoginKey m_map_pkLoginData; + TLoginDataByLoginKey m_map_pkLoginData; // Login LoginData pair typedef std::unordered_map TLoginDataByLogin; - TLoginDataByLogin m_map_pkLoginDataByLogin; - + TLoginDataByLogin m_map_pkLoginDataByLogin; + // AccountID LoginData pair typedef std::unordered_map TLoginDataByAID; - TLoginDataByAID m_map_pkLoginDataByAID; + TLoginDataByAID m_map_pkLoginDataByAID; // Login LoginData pair (실제 로그인 되어있는 계정) typedef std::unordered_map TLogonAccountMap; - TLogonAccountMap m_map_kLogonAccount; + TLogonAccountMap m_map_kLogonAccount; - int m_iPlayerIDStart; - int m_iPlayerDeleteLevelLimit; - int m_iPlayerDeleteLevelLimitLower; - bool m_bChinaEventServer; + int m_iPlayerIDStart; + int m_iPlayerDeleteLevelLimit; + int m_iPlayerDeleteLevelLimitLower; + bool m_bChinaEventServer; - std::vector m_vec_mobTable; - std::vector m_vec_itemTable; - std::map m_map_itemTableByVnum; + std::vector m_vec_mobTable; + std::vector m_vec_itemTable; + std::map m_map_itemTableByVnum; - int m_iShopTableSize; - TShopTable * m_pShopTable; + int m_iShopTableSize; + TShopTable *m_pShopTable; - int m_iRefineTableSize; - TRefineTable* m_pRefineTable; + int m_iRefineTableSize; + TRefineTable *m_pRefineTable; - std::vector m_vec_skillTable; - std::vector m_vec_banwordTable; - std::vector m_vec_itemAttrTable; - std::vector m_vec_itemRareTable; + std::vector m_vec_skillTable; + std::vector m_vec_banwordTable; + std::vector m_vec_itemAttrTable; + std::vector m_vec_itemRareTable; - std::vector m_vec_kLandTable; - std::vector m_vec_kObjectProto; - std::map m_map_pkObjectTable; + std::vector m_vec_kLandTable; + std::vector m_vec_kObjectProto; + std::map m_map_pkObjectTable; - bool m_bShutdowned; + bool m_bShutdowned; - TPlayerTableCacheMap m_map_playerCache; // 플레이어 id가 key + TPlayerTableCacheMap m_map_playerCache; // 플레이어 id가 key - TItemCacheMap m_map_itemCache; // 아이템 id가 key - TItemCacheSetPtrMap m_map_pkItemCacheSetPtr; // 플레이어 id가 key, 이 플레이어가 어떤 아이템 캐쉬를 가지고 있나? + TItemCacheMap m_map_itemCache; // 아이템 id가 key + TItemCacheSetPtrMap m_map_pkItemCacheSetPtr; // 플레이어 id가 key, 이 플레이어가 어떤 아이템 캐쉬를 가지고 있나? // MYSHOP_PRICE_LIST /// 플레이어별 아이템 가격정보 리스트 map. key: 플레이어 ID, value: 가격정보 리스트 캐시 - TItemPriceListCacheMap m_mapItemPriceListCache; ///< 플레이어별 아이템 가격정보 리스트 + TItemPriceListCacheMap m_mapItemPriceListCache; ///< 플레이어별 아이템 가격정보 리스트 // END_OF_MYSHOP_PRICE_LIST TChannelStatusMap m_mChannelStatus; struct TPartyInfo { - BYTE bRole; - BYTE bLevel; + BYTE bRole; + BYTE bLevel; - TPartyInfo() :bRole(0), bLevel(0) + TPartyInfo() : bRole(0), bLevel(0) { } }; - typedef std::map TPartyMember; - typedef std::map TPartyMap; - typedef std::map TPartyChannelMap; + typedef std::map TPartyMember; + typedef std::map TPartyMap; + typedef std::map TPartyChannelMap; TPartyChannelMap m_map_pkChannelParty; - typedef std::map TEventFlagMap; + typedef std::map TEventFlagMap; TEventFlagMap m_map_lEventFlag; - BYTE m_bLastHeader; - int m_iCacheFlushCount; - int m_iCacheFlushCountLimit; + BYTE m_bLastHeader; + int m_iCacheFlushCount; + int m_iCacheFlushCountLimit; - private : +private: TItemIDRangeTable m_itemRange; - public : +public: bool InitializeNowItemID(); DWORD GetItemID(); DWORD GainItemID(); TItemIDRangeTable GetItemRange() { return m_itemRange; } - //BOOT_LOCALIZATION - public: - /* 로컬 정보 초기화 + // BOOT_LOCALIZATION +public: + /* 로컬 정보 초기화 **/ - bool InitializeLocalization(); + bool InitializeLocalization(); - private: +private: std::vector m_vec_Locale; - //END_BOOT_LOCALIZATION - //ADMIN_MANAGER + // END_BOOT_LOCALIZATION + // ADMIN_MANAGER - bool __GetAdminInfo(const char *szIP, std::vector & rAdminVec); - bool __GetHostInfo(std::vector & rIPVec); - //END_ADMIN_MANAGER + bool __GetAdminInfo(const char *szIP, std::vector &rAdminVec); + bool __GetHostInfo(std::vector &rIPVec); + // END_ADMIN_MANAGER - - //RELOAD_ADMIN - void ReloadAdmin(CPeer * peer, TPacketReloadAdmin * p); - //END_RELOAD_ADMIN - void BreakMarriage(CPeer * peer, const char * data); + // RELOAD_ADMIN + void ReloadAdmin(CPeer *peer, TPacketReloadAdmin *p); + // END_RELOAD_ADMIN + void BreakMarriage(CPeer *peer, const char *data); struct TLogoutPlayer { - DWORD pid; - time_t time; + DWORD pid; + time_t time; - bool operator < (const TLogoutPlayer & r) - { - return (pid < r.pid); - } + bool operator<(const TLogoutPlayer &r) + { + return (pid < r.pid); + } }; - typedef std::unordered_map TLogoutPlayerMap; + typedef std::unordered_map TLogoutPlayerMap; TLogoutPlayerMap m_map_logout; - + void InsertLogoutPlayer(DWORD pid); void DeleteLogoutPlayer(DWORD pid); void UpdateLogoutPlayer(); @@ -513,42 +509,41 @@ class CClientManager : public singleton void FlushPlayerCacheSet(DWORD pid); - //MONARCH - void Election(CPeer * peer, DWORD dwHandle, const char * p); - void Candidacy(CPeer * peer, DWORD dwHandle, const char * p); - void AddMonarchMoney(CPeer * peer, DWORD dwHandle, const char * p); - void TakeMonarchMoney(CPeer * peer, DWORD dwHandle, const char * p); - void ComeToVote(CPeer * peer, DWORD dwHandle, const char * p); - void RMCandidacy(CPeer * peer, DWORD dwHandle, const char * p); - void SetMonarch(CPeer * peer, DWORD dwHandle, const char * p); - void RMMonarch(CPeer * peer, DWORD dwHandle, const char * p); - + // MONARCH + void Election(CPeer *peer, DWORD dwHandle, const char *p); + void Candidacy(CPeer *peer, DWORD dwHandle, const char *p); + void AddMonarchMoney(CPeer *peer, DWORD dwHandle, const char *p); + void TakeMonarchMoney(CPeer *peer, DWORD dwHandle, const char *p); + void ComeToVote(CPeer *peer, DWORD dwHandle, const char *p); + void RMCandidacy(CPeer *peer, DWORD dwHandle, const char *p); + 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 + void DecMonarchMoney(CPeer *peer, DWORD dwHandle, const char *p); + // END_MONARCH - void ChangeMonarchLord(CPeer* peer, DWORD dwHandle, TPacketChangeMonarchLord* info); + void ChangeMonarchLord(CPeer *peer, DWORD dwHandle, TPacketChangeMonarchLord *info); - void SendSpareItemIDRange(CPeer* peer); + void SendSpareItemIDRange(CPeer *peer); - void UpdateHorseName(TPacketUpdateHorseName* data, CPeer* peer); - void AckHorseName(DWORD dwPID, CPeer* peer); + void UpdateHorseName(TPacketUpdateHorseName *data, CPeer *peer); + void AckHorseName(DWORD dwPID, CPeer *peer); void DeleteLoginKey(TPacketDC *data); - void ResetLastPlayerID(const TPacketNeedLoginLogInfo* data); - //delete gift notify icon - void DeleteAwardId(TPacketDeleteAwardID* data); - void UpdateChannelStatus(TChannelStatus* pData); - void RequestChannelStatus(CPeer* peer, DWORD dwHandle); + void ResetLastPlayerID(const TPacketNeedLoginLogInfo *data); + // delete gift notify icon + void DeleteAwardId(TPacketDeleteAwardID *data); + void UpdateChannelStatus(TChannelStatus *pData); + void RequestChannelStatus(CPeer *peer, DWORD dwHandle); }; -template +template Func CClientManager::for_each_peer(Func f) { - TPeerList::iterator it; - for (it = m_peerList.begin(); it!=m_peerList.end();++it) - { - f(*it); - } - return f; + TPeerList::iterator it; + for (it = m_peerList.begin(); it != m_peerList.end(); ++it) + { + f(*it); + } + return f; } #endif diff --git a/src/db/src/ClientManagerBoot.cpp b/src/db/src/ClientManagerBoot.cpp index 8a9bfe6..4766e1b 100644 --- a/src/db/src/ClientManagerBoot.cpp +++ b/src/db/src/ClientManagerBoot.cpp @@ -22,19 +22,19 @@ bool CClientManager::InitializeTables() if (!MirrorMobTableIntoDB()) { SPDLOG_ERROR("MirrorMobTableIntoDB FAILED"); - return false; + return false; } if (!InitializeItemTable()) { SPDLOG_ERROR("InitializeItemTable FAILED"); - return false; + return false; } if (!MirrorItemTableIntoDB()) { SPDLOG_ERROR("MirrorItemTableIntoDB FAILED"); - return false; + return false; } if (!InitializeShopTable()) @@ -97,7 +97,6 @@ bool CClientManager::InitializeTables() return false; } - return true; } @@ -106,11 +105,11 @@ bool CClientManager::InitializeRefineTable() char query[2048]; snprintf(query, sizeof(query), - "SELECT id, cost, prob, vnum0, count0, vnum1, count1, vnum2, count2, vnum3, count3, vnum4, count4 FROM refine_proto%s", - GetTablePostfix()); + "SELECT id, cost, prob, vnum0, count0, vnum1, count1, vnum2, count2, vnum3, count3, vnum4, count4 FROM refine_proto%s", + GetTablePostfix()); std::unique_ptr pkMsg(CDBManager::instance().DirectQuery(query)); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (!pRes->uiNumRows) return true; @@ -118,26 +117,26 @@ bool CClientManager::InitializeRefineTable() if (m_pRefineTable) { SPDLOG_DEBUG("RELOAD: refine_proto"); - delete [] m_pRefineTable; + delete[] m_pRefineTable; m_pRefineTable = NULL; } m_iRefineTableSize = pRes->uiNumRows; - m_pRefineTable = new TRefineTable[m_iRefineTableSize]; + m_pRefineTable = new TRefineTable[m_iRefineTableSize]; memset(m_pRefineTable, 0, sizeof(TRefineTable) * m_iRefineTableSize); - TRefineTable* prt = m_pRefineTable; + TRefineTable *prt = m_pRefineTable; MYSQL_ROW data; while ((data = mysql_fetch_row(pRes->pSQLResult))) { - //const char* s_szQuery = "SELECT src_vnum, result_vnum, cost, prob, " + // const char* s_szQuery = "SELECT src_vnum, result_vnum, cost, prob, " //"vnum0, count0, vnum1, count1, vnum2, count2, vnum3, count3, vnum4, count4 " int col = 0; - //prt->src_vnum = atoi(data[col++]); - //prt->result_vnum = atoi(data[col++]); + // prt->src_vnum = atoi(data[col++]); + // prt->result_vnum = atoi(data[col++]); str_to_number(prt->id, data[col++]); str_to_number(prt->cost, data[col++]); str_to_number(prt->prob, data[col++]); @@ -162,30 +161,30 @@ bool CClientManager::InitializeRefineTable() class FCompareVnum { - public: - bool operator () (const TEntityTable & a, const TEntityTable & b) const - { - return (a.dwVnum < b.dwVnum); - } +public: + bool operator()(const TEntityTable &a, const TEntityTable &b) const + { + return (a.dwVnum < b.dwVnum); + } }; bool CClientManager::InitializeMobTable() { //================== 함수 설명 ==================// - //1. 요약 : 'mob_proto.txt', 'mob_proto_test.txt', 'mob_names.txt' 파일을 읽고, + // 1. 요약 : 'mob_proto.txt', 'mob_proto_test.txt', 'mob_names.txt' 파일을 읽고, // (!)[mob_table] 테이블 오브젝트를 생성한다. (타입 : TMobTable) - //2. 순서 + // 2. 순서 // 1) 'mob_names.txt' 파일을 읽어서 (a)[localMap](vnum:name) 맵을 만든다. // 2) 'mob_proto_test.txt'파일과 (a)[localMap] 맵으로 // (b)[test_map_mobTableByVnum](vnum:TMobTable) 맵을 생성한다. // 3) 'mob_proto.txt' 파일과 (a)[localMap] 맵으로 // (!)[mob_table] 테이블을 만든다. // <참고> - // 각 row 들 중, + // 각 row 들 중, // (b)[test_map_mobTableByVnum],(!)[mob_table] 모두에 있는 row는 // (b)[test_map_mobTableByVnum]의 것을 사용한다. // 4) (b)[test_map_mobTableByVnum]의 row중, (!)[mob_table]에 없는 것을 추가한다. - //3. 테스트 + // 3. 테스트 // 1)'mob_proto.txt' 정보가 mob_table에 잘 들어갔는지. -> 완료 // 2)'mob_names.txt' 정보가 mob_table에 잘 들어갔는지. // 3)'mob_proto_test.txt' 에서 [겹치는] 정보가 mob_table 에 잘 들어갔는지. @@ -193,53 +192,56 @@ bool CClientManager::InitializeMobTable() // 5) (최종) 게임 클라이언트에서 제대로 작동 하는지. //_______________________________________________// - //===============================================// // 1) 'mob_names.txt' 파일을 읽어서 (a)[localMap] 맵을 만든다. //<(a)localMap 맵 생성> - map localMap; + map localMap; bool isNameFile = true; //<파일 읽기> cCsvTable nameData; - if(!nameData.Load("mob_names.txt",'\t')) + if (!nameData.Load("mob_names.txt", '\t')) { SPDLOG_ERROR("mob_names.txt Failed to read the file"); isNameFile = false; - } else { - nameData.Next(); //설명row 생략. - while(nameData.Next()) { + } + else + { + nameData.Next(); // 설명row 생략. + while (nameData.Next()) + { localMap[atoi(nameData.AsStringByIndex(0))] = nameData.AsStringByIndex(1); } } //________________________________________________// - //===============================================// // 2) 'mob_proto_test.txt'파일과 (a)localMap 맵으로 // (b)[test_map_mobTableByVnum](vnum:TMobTable) 맵을 생성한다. - //0. - set vnumSet; //테스트용 파일 데이터중, 신규여부 확인에 사용. - //1. 파일 읽어오기 + // 0. + set vnumSet; // 테스트용 파일 데이터중, 신규여부 확인에 사용. + // 1. 파일 읽어오기 bool isTestFile = true; cCsvTable test_data; - if(!test_data.Load("mob_proto_test.txt",'\t')) + if (!test_data.Load("mob_proto_test.txt", '\t')) { SPDLOG_ERROR("No test file exists, proceed as is."); isTestFile = false; } - //2. (c)[test_map_mobTableByVnum](vnum:TMobTable) 맵 생성. + // 2. (c)[test_map_mobTableByVnum](vnum:TMobTable) 맵 생성. map test_map_mobTableByVnum; - if (isTestFile) { - test_data.Next(); //설명 로우 넘어가기. + if (isTestFile) + { + test_data.Next(); // 설명 로우 넘어가기. - //ㄱ. 테스트 몬스터 테이블 생성. - TMobTable * test_mob_table = NULL; - int test_MobTableSize = test_data.m_File.GetRowCount()-1; + // ㄱ. 테스트 몬스터 테이블 생성. + TMobTable *test_mob_table = NULL; + int test_MobTableSize = test_data.m_File.GetRowCount() - 1; test_mob_table = new TMobTable[test_MobTableSize]; 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,55 +250,56 @@ bool CClientManager::InitializeMobTable() test_map_mobTableByVnum.insert(std::map::value_type(test_mob_table->dwVnum, test_mob_table)); - ++test_mob_table; - } - + } } // 3) 'mob_proto.txt' 파일과 (a)[localMap] 맵으로 // (!)[mob_table] 테이블을 만든다. // <참고> - // 각 row 들 중, + // 각 row 들 중, // (b)[test_map_mobTableByVnum],(!)[mob_table] 모두에 있는 row는 // (b)[test_map_mobTableByVnum]의 것을 사용한다. - //1. 파일 읽기. + // 1. 파일 읽기. cCsvTable data; - if(!data.Load("mob_proto.txt",'\t')) { - SPDLOG_ERROR("mob_proto.txt Failed to read the file"); - return false; - } - data.Next(); //설명 row 넘어가기 - //2. (!)[mob_table] 생성하기 - //2.1 새로 추가되는 갯수를 파악 - int addNumber = 0; - while(data.Next()) { - int vnum = atoi(data.AsStringByIndex(0)); - std::map::iterator it_map_mobTable; - it_map_mobTable = test_map_mobTableByVnum.find(vnum); - if(it_map_mobTable != test_map_mobTableByVnum.end()) { - addNumber++; - } - } - //data를 다시 첫줄로 옮긴다.(다시 읽어온다;;) - data.Destroy(); - 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; } - data.Next(); //맨 윗줄 제외 (아이템 칼럼을 설명하는 부분) - //2.2 크기에 맞게 mob_table 생성 + data.Next(); // 설명 row 넘어가기 + // 2. (!)[mob_table] 생성하기 + // 2.1 새로 추가되는 갯수를 파악 + int addNumber = 0; + while (data.Next()) + { + int vnum = atoi(data.AsStringByIndex(0)); + std::map::iterator it_map_mobTable; + it_map_mobTable = test_map_mobTableByVnum.find(vnum); + if (it_map_mobTable != test_map_mobTableByVnum.end()) + { + addNumber++; + } + } + // data를 다시 첫줄로 옮긴다.(다시 읽어온다;;) + data.Destroy(); + if (!data.Load("mob_proto.txt", '\t')) + { + SPDLOG_ERROR("mob_proto.txt Failed to read the file"); + return false; + } + data.Next(); // 맨 윗줄 제외 (아이템 칼럼을 설명하는 부분) + // 2.2 크기에 맞게 mob_table 생성 if (!m_vec_mobTable.empty()) { SPDLOG_DEBUG("RELOAD: mob_proto"); m_vec_mobTable.clear(); } - m_vec_mobTable.resize(data.m_File.GetRowCount()-1 + addNumber); + m_vec_mobTable.resize(data.m_File.GetRowCount() - 1 + addNumber); memset(&m_vec_mobTable[0], 0, sizeof(TMobTable) * m_vec_mobTable.size()); - TMobTable * mob_table = &m_vec_mobTable[0]; - //2.3 데이터 채우기 + TMobTable *mob_table = &m_vec_mobTable[0]; + // 2.3 데이터 채우기 while (data.Next()) { int col = 0; @@ -304,11 +307,13 @@ bool CClientManager::InitializeMobTable() bool isSameRow = true; std::map::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) { + // 같은 row 가 있으면 (b)에서 읽어온다. + if (isSameRow) + { TMobTable *tempTable = it_map_mobTable->second; mob_table->dwVnum = tempTable->dwVnum; @@ -343,21 +348,20 @@ bool CClientManager::InitializeMobTable() mob_table->bAggresiveHPPct = tempTable->bAggresiveHPPct; mob_table->wAggressiveSight = tempTable->wAggressiveSight; mob_table->wAttackRange = tempTable->wAttackRange; - + mob_table->dwDropItemVnum = tempTable->dwDropItemVnum; mob_table->dwResurrectionVnum = tempTable->dwResurrectionVnum; for (int i = 0; i < MOB_ENCHANTS_MAX_NUM; ++i) mob_table->cEnchants[i] = tempTable->cEnchants[i]; - + for (int i = 0; i < MOB_RESISTS_MAX_NUM; ++i) mob_table->cResists[i] = tempTable->cResists[i]; - + mob_table->fDamMultiply = tempTable->fDamMultiply; mob_table->dwSummonVnum = tempTable->dwSummonVnum; 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; @@ -368,52 +372,51 @@ bool CClientManager::InitializeMobTable() mob_table->Skills[3].dwVnum = tempTable->Skills[3].dwVnum; mob_table->Skills[4].bLevel = tempTable->Skills[4].bLevel; mob_table->Skills[4].dwVnum = tempTable->Skills[4].dwVnum; - + mob_table->bBerserkPoint = tempTable->bBerserkPoint; mob_table->bStoneSkinPoint = tempTable->bStoneSkinPoint; 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 추가 + // 셋에 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(); isTestFile = true; test_data; - if(!test_data.Load("mob_proto_test.txt",'\t')) + if (!test_data.Load("mob_proto_test.txt", '\t')) { SPDLOG_ERROR("No test file exists, proceed as is."); isTestFile = false; } - if(isTestFile) { - test_data.Next(); //설명 로우 넘어가기. + if (isTestFile) + { + test_data.Next(); // 설명 로우 넘어가기. - while (test_data.Next()) //테스트 데이터 각각을 훑어나가며,새로운 것을 추가한다. + while (test_data.Next()) // 테스트 데이터 각각을 훑어나가며,새로운 것을 추가한다. { - //중복되는 부분이면 넘어간다. + // 중복되는 부분이면 넘어간다. set::iterator itVnum; - itVnum=vnumSet.find(atoi(test_data.AsStringByIndex(0))); - if (itVnum != vnumSet.end()) { + itVnum = vnumSet.find(atoi(test_data.AsStringByIndex(0))); + 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()); @@ -433,10 +435,10 @@ bool CClientManager::InitializeMobTable() bool CClientManager::InitializeShopTable() { - MYSQL_ROW data; - int col; + MYSQL_ROW data; + int col; - static const char * s_szQuery = + static const char *s_szQuery = "SELECT " "shop.vnum, " "shop.npc_vnum, " @@ -449,7 +451,7 @@ bool CClientManager::InitializeShopTable() // shop의 vnum은 있는데 shop_item 이 없을경우... 실패로 처리되니 주의 요망. // 고처야할부분 - SQLResult * pRes2 = pkMsg2->Get(); + SQLResult *pRes2 = pkMsg2->Get(); if (!pRes2->uiNumRows) { @@ -461,11 +463,11 @@ bool CClientManager::InitializeShopTable() if (m_pShopTable) { - delete [] (m_pShopTable); + delete[] (m_pShopTable); m_pShopTable = NULL; } - TShopTable * shop_table = m_pShopTable; + TShopTable *shop_table = m_pShopTable; while ((data = mysql_fetch_row(pRes2->pSQLResult))) { @@ -478,7 +480,7 @@ bool CClientManager::InitializeShopTable() { shop_table = new TShopTable; memset(shop_table, 0, sizeof(TShopTable)); - shop_table->dwVnum = iShopVnum; + shop_table->dwVnum = iShopVnum; map_shop[iShopVnum] = shop_table; } @@ -487,10 +489,10 @@ bool CClientManager::InitializeShopTable() str_to_number(shop_table->dwNPCVnum, data[col++]); - if (!data[col]) // 아이템이 하나도 없으면 NULL이 리턴 되므로.. + if (!data[col]) // 아이템이 하나도 없으면 NULL이 리턴 되므로.. continue; - TShopItemTable * pItem = &shop_table->items[shop_table->byItemCount]; + TShopItemTable *pItem = &shop_table->items[shop_table->byItemCount]; str_to_number(pItem->vnum, data[col++]); str_to_number(pItem->count, data[col++]); @@ -519,13 +521,13 @@ bool CClientManager::InitializeQuestItemTable() { using namespace std; - static const char * s_szQuery = "SELECT vnum, name, %s FROM quest_item_proto ORDER BY vnum"; + static const char *s_szQuery = "SELECT vnum, name, %s FROM quest_item_proto ORDER BY vnum"; char query[1024]; snprintf(query, sizeof(query), s_szQuery, g_stLocaleNameColumn.c_str()); std::unique_ptr pkMsg(CDBManager::instance().DirectQuery(query)); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (!pRes->uiNumRows) { @@ -595,21 +597,22 @@ 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. //=================================================================================// bool isNameFile = true; - map localMap; + map localMap; cCsvTable nameData; - if(!nameData.Load("item_names.txt",'\t')) + if (!nameData.Load("item_names.txt", '\t')) { 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); } } @@ -622,22 +625,24 @@ bool CClientManager::InitializeItemTable() map test_map_itemTableByVnum; // 1. Read the file. cCsvTable test_data; - if(!test_data.Load("item_proto_test.txt",'\t')) + if (!test_data.Load("item_proto_test.txt", '\t')) { SPDLOG_ERROR("item_proto_test.txt Failed to read the file"); - //return false; - } else { - test_data.Next(); //설명 로우 넘어가기. + // return false; + } + else + { + test_data.Next(); // 설명 로우 넘어가기. // 2. Create the test item table. - TItemTable * test_item_table = NULL; - int test_itemTableSize = test_data.m_File.GetRowCount()-1; + TItemTable *test_item_table = NULL; + int test_itemTableSize = test_data.m_File.GetRowCount() - 1; test_item_table = new TItemTable[test_itemTableSize]; 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::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 . @@ -666,7 +669,7 @@ bool CClientManager::InitializeItemTable() // Read the file. cCsvTable data; - if(!data.Load("item_proto.txt",'\t')) + if (!data.Load("item_proto.txt", '\t')) { SPDLOG_ERROR("item_proto.txt Failed to read the file"); return false; @@ -683,17 +686,19 @@ 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::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++; } } // Move the data back to the first line (re-read it;;) data.Destroy(); - if(!data.Load("item_proto.txt",'\t')) + if (!data.Load("item_proto.txt", '\t')) { SPDLOG_ERROR("item_proto.txt Failed to read the file"); return false; @@ -702,9 +707,9 @@ bool CClientManager::InitializeItemTable() m_vec_itemTable.resize(data.m_File.GetRowCount() - 1 + addNumber); memset(&m_vec_itemTable[0], 0, sizeof(TItemTable) * m_vec_itemTable.size()); - int testValue = m_vec_itemTable.size(); + int testValue = m_vec_itemTable.size(); - TItemTable * item_table = &m_vec_itemTable[0]; + TItemTable *item_table = &m_vec_itemTable[0]; while (data.Next()) { @@ -712,17 +717,17 @@ bool CClientManager::InitializeItemTable() std::map::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; @@ -737,8 +742,8 @@ bool CClientManager::InitializeItemTable() item_table->dwImmuneFlag = tempTable->dwImmuneFlag; item_table->dwGold = tempTable->dwGold; item_table->dwShopBuyPrice = tempTable->dwShopBuyPrice; - item_table->dwRefinedVnum =tempTable->dwRefinedVnum; - item_table->wRefineSet =tempTable->wRefineSet; + item_table->dwRefinedVnum = tempTable->dwRefinedVnum; + item_table->wRefineSet = tempTable->wRefineSet; item_table->bAlterToMagicItemPct = tempTable->bAlterToMagicItemPct; item_table->cLimitRealTimeFirstUseIndex = -1; item_table->cLimitTimerBasedOnWearIndex = -1; @@ -769,8 +774,7 @@ bool CClientManager::InitializeItemTable() item_table->bGainSocketPct = tempTable->bGainSocketPct; item_table->sAddonType = tempTable->sAddonType; - item_table->bWeight = tempTable->bWeight; - + item_table->bWeight = tempTable->bWeight; } vnumSet.insert(item_table->dwVnum); m_map_itemTableByVnum.insert(std::map::value_type(item_table->dwVnum, item_table)); @@ -782,37 +786,36 @@ bool CClientManager::InitializeItemTable() // 4) Add rows from (b) [test_map_itemTableByVnum] that do not exist in (!) [item_table]. //========================================================================// test_data.Destroy(); - if(!test_data.Load("item_proto_test.txt",'\t')) + if (!test_data.Load("item_proto_test.txt", '\t')) { SPDLOG_ERROR("item_proto_test.txt Failed to read the file"); - //return false; - } else { - test_data.Next(); // Skip the description row. + // return false; + } + else + { + test_data.Next(); // Skip the description row. - while (test_data.Next()) // Iterate through each test data entry and add new ones. + while (test_data.Next()) // Iterate through each test data entry and add new ones. { // Skip if it’s a duplicate. set::iterator itVnum; - itVnum=vnumSet.find(atoi(test_data.AsStringByIndex(0))); - if (itVnum != vnumSet.end()) { + itVnum = vnumSet.find(atoi(test_data.AsStringByIndex(0))); + if (itVnum != vnumSet.end()) + { continue; } - + if (!Set_Proto_Item_Table(item_table, test_data, localMap)) { SPDLOG_ERROR("Item proto table setup failed."); } - m_map_itemTableByVnum.insert(std::map::value_type(item_table->dwVnum, item_table)); item_table++; - } } - - // QUEST_ITEM_PROTO_DISABLE // InitializeQuestItemTable(); // END_OF_QUEST_ITEM_PROTO_DISABLE @@ -823,24 +826,24 @@ bool CClientManager::InitializeItemTable() while (it != m_vec_itemTable.end()) { - TItemTable * item_table = &(*(it++)); + TItemTable *item_table = &(*(it++)); SPDLOG_TRACE("ITEM: #{:<5} {:24} {:24} VAL: {} {} {} {} {} {} WEAR {} ANTI {} IMMUNE {} REFINE {} REFINE_SET {} MAGIC_PCT {}", - item_table->dwVnum, - item_table->szName, - item_table->szLocaleName, - item_table->alValues[0], - item_table->alValues[1], - item_table->alValues[2], - item_table->alValues[3], - item_table->alValues[4], - item_table->alValues[5], - item_table->dwWearFlags, - item_table->dwAntiFlags, - item_table->dwImmuneFlag, - item_table->dwRefinedVnum, - item_table->wRefineSet, - item_table->bAlterToMagicItemPct); + item_table->dwVnum, + item_table->szName, + item_table->szLocaleName, + item_table->alValues[0], + item_table->alValues[1], + item_table->alValues[2], + item_table->alValues[3], + item_table->alValues[4], + item_table->alValues[5], + item_table->dwWearFlags, + item_table->dwAntiFlags, + item_table->dwImmuneFlag, + item_table->dwRefinedVnum, + item_table->wRefineSet, + item_table->bAlterToMagicItemPct); m_map_itemTableByVnum.insert(std::map::value_type(item_table->dwVnum, item_table)); } @@ -848,22 +851,21 @@ bool CClientManager::InitializeItemTable() return true; } - bool CClientManager::InitializeSkillTable() { char query[4096]; snprintf(query, sizeof(query), - "SELECT dwVnum, szName, bType, bMaxLevel, dwSplashRange, " - "szPointOn, szPointPoly, szSPCostPoly, szDurationPoly, szDurationSPCostPoly, " - "szCooldownPoly, szMasterBonusPoly, setFlag+0, setAffectFlag+0, " - "szPointOn2, szPointPoly2, szDurationPoly2, setAffectFlag2+0, " - "szPointOn3, szPointPoly3, szDurationPoly3, szGrandMasterAddSPCostPoly, " - "bLevelStep, bLevelLimit, prerequisiteSkillVnum, prerequisiteSkillLevel, iMaxHit, szSplashAroundDamageAdjustPoly, eSkillType+0, dwTargetRange " - "FROM skill_proto%s ORDER BY dwVnum", - GetTablePostfix()); + "SELECT dwVnum, szName, bType, bMaxLevel, dwSplashRange, " + "szPointOn, szPointPoly, szSPCostPoly, szDurationPoly, szDurationSPCostPoly, " + "szCooldownPoly, szMasterBonusPoly, setFlag+0, setAffectFlag+0, " + "szPointOn2, szPointPoly2, szDurationPoly2, setAffectFlag2+0, " + "szPointOn3, szPointPoly3, szDurationPoly3, szGrandMasterAddSPCostPoly, " + "bLevelStep, bLevelLimit, prerequisiteSkillVnum, prerequisiteSkillLevel, iMaxHit, szSplashAroundDamageAdjustPoly, eSkillType+0, dwTargetRange " + "FROM skill_proto%s ORDER BY dwVnum", + GetTablePostfix()); std::unique_ptr pkMsg(CDBManager::instance().DirectQuery(query)); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (!pRes->uiNumRows) { @@ -879,8 +881,8 @@ bool CClientManager::InitializeSkillTable() m_vec_skillTable.reserve(pRes->uiNumRows); - MYSQL_ROW data; - int col; + MYSQL_ROW data; + int col; while ((data = mysql_fetch_row(pRes->pSQLResult))) { @@ -945,7 +947,7 @@ bool CClientManager::InitializeBanwordTable() std::unique_ptr pkMsg(CDBManager::instance().DirectQuery("SELECT word FROM banword")); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (pRes->uiNumRows == 0) return true; @@ -971,11 +973,11 @@ bool CClientManager::InitializeItemAttrTable() { char query[4096]; snprintf(query, sizeof(query), - "SELECT apply, apply+0, prob, lv1, lv2, lv3, lv4, lv5, weapon, body, wrist, foots, neck, head, shield, ear FROM item_attr%s ORDER BY apply", - GetTablePostfix()); + "SELECT apply, apply+0, prob, lv1, lv2, lv3, lv4, lv5, weapon, body, wrist, foots, neck, head, shield, ear FROM item_attr%s ORDER BY apply", + GetTablePostfix()); std::unique_ptr pkMsg(CDBManager::instance().DirectQuery(query)); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (!pRes->uiNumRows) { @@ -991,7 +993,7 @@ bool CClientManager::InitializeItemAttrTable() m_vec_itemAttrTable.reserve(pRes->uiNumRows); - MYSQL_ROW data; + MYSQL_ROW data; while ((data = mysql_fetch_row(pRes->pSQLResult))) { @@ -1019,21 +1021,21 @@ bool CClientManager::InitializeItemAttrTable() str_to_number(t.bMaxLevelBySet[ATTRIBUTE_SET_EAR], data[col++]); SPDLOG_TRACE("ITEM_ATTR: {:20} {:4} ( {:3} {:3} {:3} {:3} {:3} ) ( {} {} {} {} {} {} {} )", - t.szApply, - t.dwProb, - t.lValues[0], - t.lValues[1], - t.lValues[2], - t.lValues[3], - t.lValues[4], - t.bMaxLevelBySet[ATTRIBUTE_SET_WEAPON], - t.bMaxLevelBySet[ATTRIBUTE_SET_BODY], - t.bMaxLevelBySet[ATTRIBUTE_SET_WRIST], - t.bMaxLevelBySet[ATTRIBUTE_SET_FOOTS], - t.bMaxLevelBySet[ATTRIBUTE_SET_NECK], - t.bMaxLevelBySet[ATTRIBUTE_SET_HEAD], - t.bMaxLevelBySet[ATTRIBUTE_SET_SHIELD], - t.bMaxLevelBySet[ATTRIBUTE_SET_EAR]); + t.szApply, + t.dwProb, + t.lValues[0], + t.lValues[1], + t.lValues[2], + t.lValues[3], + t.lValues[4], + t.bMaxLevelBySet[ATTRIBUTE_SET_WEAPON], + t.bMaxLevelBySet[ATTRIBUTE_SET_BODY], + t.bMaxLevelBySet[ATTRIBUTE_SET_WRIST], + t.bMaxLevelBySet[ATTRIBUTE_SET_FOOTS], + t.bMaxLevelBySet[ATTRIBUTE_SET_NECK], + t.bMaxLevelBySet[ATTRIBUTE_SET_HEAD], + t.bMaxLevelBySet[ATTRIBUTE_SET_SHIELD], + t.bMaxLevelBySet[ATTRIBUTE_SET_EAR]); m_vec_itemAttrTable.push_back(t); } @@ -1045,11 +1047,11 @@ bool CClientManager::InitializeItemRareTable() { char query[4096]; snprintf(query, sizeof(query), - "SELECT apply, apply+0, prob, lv1, lv2, lv3, lv4, lv5, weapon, body, wrist, foots, neck, head, shield, ear FROM item_attr_rare%s ORDER BY apply", - GetTablePostfix()); + "SELECT apply, apply+0, prob, lv1, lv2, lv3, lv4, lv5, weapon, body, wrist, foots, neck, head, shield, ear FROM item_attr_rare%s ORDER BY apply", + GetTablePostfix()); std::unique_ptr pkMsg(CDBManager::instance().DirectQuery(query)); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (!pRes->uiNumRows) { @@ -1065,7 +1067,7 @@ bool CClientManager::InitializeItemRareTable() m_vec_itemRareTable.reserve(pRes->uiNumRows); - MYSQL_ROW data; + MYSQL_ROW data; while ((data = mysql_fetch_row(pRes->pSQLResult))) { @@ -1093,21 +1095,21 @@ bool CClientManager::InitializeItemRareTable() str_to_number(t.bMaxLevelBySet[ATTRIBUTE_SET_EAR], data[col++]); SPDLOG_TRACE("ITEM_RARE: {:20} {:4} ( {:3} {:3} {:3} {:3} {:3} ) ( {} {} {} {} {} {} {} )", - t.szApply, - t.dwProb, - t.lValues[0], - t.lValues[1], - t.lValues[2], - t.lValues[3], - t.lValues[4], - t.bMaxLevelBySet[ATTRIBUTE_SET_WEAPON], - t.bMaxLevelBySet[ATTRIBUTE_SET_BODY], - t.bMaxLevelBySet[ATTRIBUTE_SET_WRIST], - t.bMaxLevelBySet[ATTRIBUTE_SET_FOOTS], - t.bMaxLevelBySet[ATTRIBUTE_SET_NECK], - t.bMaxLevelBySet[ATTRIBUTE_SET_HEAD], - t.bMaxLevelBySet[ATTRIBUTE_SET_SHIELD], - t.bMaxLevelBySet[ATTRIBUTE_SET_EAR]); + t.szApply, + t.dwProb, + t.lValues[0], + t.lValues[1], + t.lValues[2], + t.lValues[3], + t.lValues[4], + t.bMaxLevelBySet[ATTRIBUTE_SET_WEAPON], + t.bMaxLevelBySet[ATTRIBUTE_SET_BODY], + t.bMaxLevelBySet[ATTRIBUTE_SET_WRIST], + t.bMaxLevelBySet[ATTRIBUTE_SET_FOOTS], + t.bMaxLevelBySet[ATTRIBUTE_SET_NECK], + t.bMaxLevelBySet[ATTRIBUTE_SET_HEAD], + t.bMaxLevelBySet[ATTRIBUTE_SET_SHIELD], + t.bMaxLevelBySet[ATTRIBUTE_SET_EAR]); m_vec_itemRareTable.push_back(t); } @@ -1122,12 +1124,12 @@ bool CClientManager::InitializeLandTable() char query[4096]; snprintf(query, sizeof(query), - "SELECT id, map_index, x, y, width, height, guild_id, guild_level_limit, price " - "FROM land%s WHERE enable='YES' ORDER BY id", - GetTablePostfix()); + "SELECT id, map_index, x, y, width, height, guild_id, guild_level_limit, price " + "FROM land%s WHERE enable='YES' ORDER BY id", + GetTablePostfix()); std::unique_ptr pkMsg(CDBManager::instance().DirectQuery(query)); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (!m_vec_kLandTable.empty()) { @@ -1137,7 +1139,7 @@ bool CClientManager::InitializeLandTable() m_vec_kLandTable.reserve(pRes->uiNumRows); - MYSQL_ROW data; + MYSQL_ROW data; if (pRes->uiNumRows > 0) while ((data = mysql_fetch_row(pRes->pSQLResult))) @@ -1166,28 +1168,28 @@ bool CClientManager::InitializeLandTable() return true; } -void parse_pair_number_string(const char * c_pszString, std::vector > & vec) +void parse_pair_number_string(const char *c_pszString, std::vector> &vec) { // format: 10,1/20,3/300,50 - const char * t = c_pszString; - const char * p = strchr(t, '/'); + const char *t = c_pszString; + const char *p = strchr(t, '/'); std::pair k; char szNum[32 + 1]; - char * comma; + char *comma; while (p) { if (isdigit(*t)) { - strlcpy(szNum, t, std::min(sizeof(szNum), (p-t)+1)); + strlcpy(szNum, t, std::min(sizeof(szNum), (p - t) + 1)); comma = strchr(szNum, ','); if (comma) { *comma = '\0'; - str_to_number(k.second, comma+1); + str_to_number(k.second, comma + 1); } else k.second = 0; @@ -1204,12 +1206,12 @@ void parse_pair_number_string(const char * c_pszString, std::vector(t), ','); + comma = strchr(const_cast(t), ','); if (comma) { *comma = '\0'; - str_to_number(k.second, comma+1); + str_to_number(k.second, comma + 1); } else k.second = 0; @@ -1225,12 +1227,12 @@ bool CClientManager::InitializeObjectProto() char query[4096]; snprintf(query, sizeof(query), - "SELECT vnum, price, materials, upgrade_vnum, upgrade_limit_time, life, reg_1, reg_2, reg_3, reg_4, npc, group_vnum, dependent_group " - "FROM object_proto%s ORDER BY vnum", - GetTablePostfix()); + "SELECT vnum, price, materials, upgrade_vnum, upgrade_limit_time, life, reg_1, reg_2, reg_3, reg_4, npc, group_vnum, dependent_group " + "FROM object_proto%s ORDER BY vnum", + GetTablePostfix()); std::unique_ptr pkMsg(CDBManager::instance().DirectQuery(query)); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (!m_vec_kObjectProto.empty()) { @@ -1240,7 +1242,7 @@ bool CClientManager::InitializeObjectProto() m_vec_kObjectProto.reserve(std::max(0, pRes->uiNumRows)); - MYSQL_ROW data; + MYSQL_ROW data; if (pRes->uiNumRows > 0) while ((data = mysql_fetch_row(pRes->pSQLResult))) @@ -1254,12 +1256,12 @@ bool CClientManager::InitializeObjectProto() str_to_number(t.dwVnum, data[col++]); str_to_number(t.dwPrice, data[col++]); - std::vector > vec; + std::vector> vec; parse_pair_number_string(data[col++], vec); for (unsigned int i = 0; i < OBJECT_MATERIAL_MAX_NUM && i < vec.size(); ++i) { - std::pair & r = vec[i]; + std::pair &r = vec[i]; t.kMaterials[i].dwItemVnum = r.first; t.kMaterials[i].dwCount = r.second; @@ -1279,11 +1281,11 @@ bool CClientManager::InitializeObjectProto() str_to_number(t.dwDependOnGroupVnum, data[col++]); t.lNPCX = 0; - t.lNPCY = std::max(t.lRegion[1], t.lRegion[3])+300; + t.lNPCY = std::max(t.lRegion[1], t.lRegion[3]) + 300; // END_OF_ADD_BUILDING_NPC SPDLOG_TRACE("OBJ_PROTO: vnum {} price {} mat {} {}", - t.dwVnum, t.dwPrice, t.kMaterials[0].dwItemVnum, t.kMaterials[0].dwCount); + t.dwVnum, t.dwPrice, t.kMaterials[0].dwItemVnum, t.kMaterials[0].dwCount); m_vec_kObjectProto.push_back(t); } @@ -1299,7 +1301,7 @@ bool CClientManager::InitializeObjectTable() snprintf(query, sizeof(query), "SELECT id, land_id, vnum, map_index, x, y, x_rot, y_rot, z_rot, life FROM object%s ORDER BY id", GetTablePostfix()); std::unique_ptr pkMsg(CDBManager::instance().DirectQuery(query)); - SQLResult * pRes = pkMsg->Get(); + SQLResult *pRes = pkMsg->Get(); if (!m_map_pkObjectTable.empty()) { @@ -1312,7 +1314,7 @@ bool CClientManager::InitializeObjectTable() if (pRes->uiNumRows > 0) while ((data = mysql_fetch_row(pRes->pSQLResult))) { - TObject * k = new TObject; + TObject *k = new TObject; memset(k, 0, sizeof(TObject)); @@ -1330,7 +1332,7 @@ bool CClientManager::InitializeObjectTable() str_to_number(k->lLife, data[col++]); SPDLOG_DEBUG("OBJ: {} vnum {} map {:<4} {:7}x{:<7} life {}", - k->dwID, k->dwVnum, k->lMapIndex, k->x, k->y, k->lLife); + k->dwID, k->dwVnum, k->lMapIndex, k->x, k->y, k->lLife); m_map_pkObjectTable.insert(std::make_pair(k->dwID, k)); } @@ -1349,111 +1351,109 @@ bool CClientManager::MirrorMobTableIntoDB() { for (itertype(m_vec_mobTable) it = m_vec_mobTable.begin(); it != m_vec_mobTable.end(); it++) { - const TMobTable& t = *it; + const TMobTable &t = *it; char query[4096]; if (g_stLocaleNameColumn == "name") { snprintf(query, sizeof(query), - "replace into mob_proto%s " - "(" - "vnum, name, type, rank, battle_type, level, size, ai_flag, setRaceFlag, setImmuneFlag, " - "on_click, empire, drop_item, resurrection_vnum, folder, " - "st, dx, ht, iq, damage_min, damage_max, max_hp, regen_cycle, regen_percent, exp, " - "gold_min, gold_max, def, attack_speed, move_speed, aggressive_hp_pct, aggressive_sight, attack_range, polymorph_item, " + "replace into mob_proto%s " + "(" + "vnum, name, type, rank, battle_type, level, size, ai_flag, setRaceFlag, setImmuneFlag, " + "on_click, empire, drop_item, resurrection_vnum, folder, " + "st, dx, ht, iq, damage_min, damage_max, max_hp, regen_cycle, regen_percent, exp, " + "gold_min, gold_max, def, attack_speed, move_speed, aggressive_hp_pct, aggressive_sight, attack_range, polymorph_item, " - "enchant_curse, enchant_slow, enchant_poison, enchant_stun, enchant_critical, enchant_penetrate, " - "resist_sword, resist_twohand, resist_dagger, resist_bell, resist_fan, resist_bow, " - "resist_fire, resist_elect, resist_magic, resist_wind, resist_poison, " - "dam_multiply, summon, drain_sp, " + "enchant_curse, enchant_slow, enchant_poison, enchant_stun, enchant_critical, enchant_penetrate, " + "resist_sword, resist_twohand, resist_dagger, resist_bell, resist_fan, resist_bow, " + "resist_fire, resist_elect, resist_magic, resist_wind, resist_poison, " + "dam_multiply, summon, drain_sp, " - "skill_vnum0, skill_level0, skill_vnum1, skill_level1, skill_vnum2, skill_level2, " - "skill_vnum3, skill_level3, skill_vnum4, skill_level4, " - "sp_berserk, sp_stoneskin, sp_godspeed, sp_deathblow, sp_revive" - ") " - "values (" + "skill_vnum0, skill_level0, skill_vnum1, skill_level1, skill_vnum2, skill_level2, " + "skill_vnum3, skill_level3, skill_vnum4, skill_level4, " + "sp_berserk, sp_stoneskin, sp_godspeed, sp_deathblow, sp_revive" + ") " + "values (" - "%d, \"%s\", %d, %d, %d, %d, %d, %u, %u, %u, " - "%d, %d, %d, %d, '%s', " - "%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, %d, %d, %d, " + "%d, \"%s\", %d, %d, %d, %d, %d, %u, %u, %u, " + "%d, %d, %d, %d, '%s', " + "%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, " - "%f, %d, %d, " + "%d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, " + "%f, %d, %d, " - "%d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, " - "%d, %d, %d, %d, %d" - ")", - GetTablePostfix(), /*g_stLocaleNameColumn.c_str(),*/ + "%d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, " + "%d, %d, %d, %d, %d" + ")", + GetTablePostfix(), /*g_stLocaleNameColumn.c_str(),*/ - t.dwVnum, t.szName, /*t.szLocaleName, */t.bType, t.bRank, t.bBattleType, t.bLevel, t.bSize, t.dwAIFlag, t.dwRaceFlag, t.dwImmuneFlag, - t.bOnClickType, t.bEmpire, t.dwDropItemVnum, t.dwResurrectionVnum, t.szFolder, - t.bStr, t.bDex, t.bCon, t.bInt, t.dwDamageRange[0], t.dwDamageRange[1], t.dwMaxHP, t.bRegenCycle, t.bRegenPercent, t.dwExp, + t.dwVnum, t.szName, /*t.szLocaleName, */ t.bType, t.bRank, t.bBattleType, t.bLevel, t.bSize, t.dwAIFlag, t.dwRaceFlag, t.dwImmuneFlag, + t.bOnClickType, t.bEmpire, t.dwDropItemVnum, t.dwResurrectionVnum, t.szFolder, + t.bStr, t.bDex, t.bCon, t.bInt, t.dwDamageRange[0], t.dwDamageRange[1], t.dwMaxHP, t.bRegenCycle, t.bRegenPercent, t.dwExp, - t.dwGoldMin, t.dwGoldMax, t.wDef, t.sAttackSpeed, t.sMovingSpeed, t.bAggresiveHPPct, t.wAggressiveSight, t.wAttackRange, t.dwPolymorphItemVnum, - t.cEnchants[0], t.cEnchants[1], t.cEnchants[2], t.cEnchants[3], t.cEnchants[4], t.cEnchants[5], - t.cResists[0], t.cResists[1], t.cResists[2], t.cResists[3], t.cResists[4], t.cResists[5], - t.cResists[6], t.cResists[7], t.cResists[8], t.cResists[9], t.cResists[10], - t.fDamMultiply, t.dwSummonVnum, t.dwDrainSP, + t.dwGoldMin, t.dwGoldMax, t.wDef, t.sAttackSpeed, t.sMovingSpeed, t.bAggresiveHPPct, t.wAggressiveSight, t.wAttackRange, t.dwPolymorphItemVnum, + t.cEnchants[0], t.cEnchants[1], t.cEnchants[2], t.cEnchants[3], t.cEnchants[4], t.cEnchants[5], + t.cResists[0], t.cResists[1], t.cResists[2], t.cResists[3], t.cResists[4], t.cResists[5], + t.cResists[6], t.cResists[7], t.cResists[8], t.cResists[9], t.cResists[10], + t.fDamMultiply, t.dwSummonVnum, t.dwDrainSP, - 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.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); } else { snprintf(query, sizeof(query), - "replace into mob_proto%s " - "(" - "vnum, name, %s, type, rank, battle_type, level, size, ai_flag, setRaceFlag, setImmuneFlag, " - "on_click, empire, drop_item, resurrection_vnum, folder, " - "st, dx, ht, iq, damage_min, damage_max, max_hp, regen_cycle, regen_percent, exp, " - "gold_min, gold_max, def, attack_speed, move_speed, aggressive_hp_pct, aggressive_sight, attack_range, polymorph_item, " + "replace into mob_proto%s " + "(" + "vnum, name, %s, type, rank, battle_type, level, size, ai_flag, setRaceFlag, setImmuneFlag, " + "on_click, empire, drop_item, resurrection_vnum, folder, " + "st, dx, ht, iq, damage_min, damage_max, max_hp, regen_cycle, regen_percent, exp, " + "gold_min, gold_max, def, attack_speed, move_speed, aggressive_hp_pct, aggressive_sight, attack_range, polymorph_item, " - "enchant_curse, enchant_slow, enchant_poison, enchant_stun, enchant_critical, enchant_penetrate, " - "resist_sword, resist_twohand, resist_dagger, resist_bell, resist_fan, resist_bow, " - "resist_fire, resist_elect, resist_magic, resist_wind, resist_poison, " - "dam_multiply, summon, drain_sp, " + "enchant_curse, enchant_slow, enchant_poison, enchant_stun, enchant_critical, enchant_penetrate, " + "resist_sword, resist_twohand, resist_dagger, resist_bell, resist_fan, resist_bow, " + "resist_fire, resist_elect, resist_magic, resist_wind, resist_poison, " + "dam_multiply, summon, drain_sp, " - "skill_vnum0, skill_level0, skill_vnum1, skill_level1, skill_vnum2, skill_level2, " - "skill_vnum3, skill_level3, skill_vnum4, skill_level4, " - "sp_berserk, sp_stoneskin, sp_godspeed, sp_deathblow, sp_revive" - ") " - "values (" + "skill_vnum0, skill_level0, skill_vnum1, skill_level1, skill_vnum2, skill_level2, " + "skill_vnum3, skill_level3, skill_vnum4, skill_level4, " + "sp_berserk, sp_stoneskin, sp_godspeed, sp_deathblow, sp_revive" + ") " + "values (" - "%d, \"%s\", \"%s\", %d, %d, %d, %d, %d, %u, %u, %u, " - "%d, %d, %d, %d, '%s', " - "%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, %d, %d, %d, " + "%d, \"%s\", \"%s\", %d, %d, %d, %d, %d, %u, %u, %u, " + "%d, %d, %d, %d, '%s', " + "%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, " - "%f, %d, %d, " + "%d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, " + "%f, %d, %d, " - "%d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, " - "%d, %d, %d, %d, %d" - ")", - GetTablePostfix(), g_stLocaleNameColumn.c_str(), + "%d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, " + "%d, %d, %d, %d, %d" + ")", + GetTablePostfix(), g_stLocaleNameColumn.c_str(), - t.dwVnum, t.szName, t.szLocaleName, t.bType, t.bRank, t.bBattleType, t.bLevel, t.bSize, t.dwAIFlag, t.dwRaceFlag, t.dwImmuneFlag, - t.bOnClickType, t.bEmpire, t.dwDropItemVnum, t.dwResurrectionVnum, t.szFolder, - t.bStr, t.bDex, t.bCon, t.bInt, t.dwDamageRange[0], t.dwDamageRange[1], t.dwMaxHP, t.bRegenCycle, t.bRegenPercent, t.dwExp, + t.dwVnum, t.szName, t.szLocaleName, t.bType, t.bRank, t.bBattleType, t.bLevel, t.bSize, t.dwAIFlag, t.dwRaceFlag, t.dwImmuneFlag, + t.bOnClickType, t.bEmpire, t.dwDropItemVnum, t.dwResurrectionVnum, t.szFolder, + t.bStr, t.bDex, t.bCon, t.bInt, t.dwDamageRange[0], t.dwDamageRange[1], t.dwMaxHP, t.bRegenCycle, t.bRegenPercent, t.dwExp, - t.dwGoldMin, t.dwGoldMax, t.wDef, t.sAttackSpeed, t.sMovingSpeed, t.bAggresiveHPPct, t.wAggressiveSight, t.wAttackRange, t.dwPolymorphItemVnum, - t.cEnchants[0], t.cEnchants[1], t.cEnchants[2], t.cEnchants[3], t.cEnchants[4], t.cEnchants[5], - t.cResists[0], t.cResists[1], t.cResists[2], t.cResists[3], t.cResists[4], t.cResists[5], - t.cResists[6], t.cResists[7], t.cResists[8], t.cResists[9], t.cResists[10], - t.fDamMultiply, t.dwSummonVnum, t.dwDrainSP, + t.dwGoldMin, t.dwGoldMax, t.wDef, t.sAttackSpeed, t.sMovingSpeed, t.bAggresiveHPPct, t.wAggressiveSight, t.wAttackRange, t.dwPolymorphItemVnum, + t.cEnchants[0], t.cEnchants[1], t.cEnchants[2], t.cEnchants[3], t.cEnchants[4], t.cEnchants[5], + t.cResists[0], t.cResists[1], t.cResists[2], t.cResists[3], t.cResists[4], t.cResists[5], + t.cResists[6], t.cResists[7], t.cResists[8], t.cResists[9], t.cResists[10], + t.fDamMultiply, t.dwSummonVnum, t.dwDrainSP, - 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.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); } CDBManager::instance().AsyncQuery(query); @@ -1467,58 +1467,58 @@ bool CClientManager::MirrorItemTableIntoDB() { if (g_stLocaleNameColumn != "name") { - const TItemTable& t = *it; + const TItemTable &t = *it; char query[4096]; snprintf(query, sizeof(query), - "replace into item_proto%s (" - "vnum, type, subtype, name, %s, gold, shop_buy_price, weight, size, " - "flag, wearflag, antiflag, immuneflag, " - "refined_vnum, refine_set, magic_pct, socket_pct, addon_type, " - "limittype0, limitvalue0, limittype1, limitvalue1, " - "applytype0, applyvalue0, applytype1, applyvalue1, applytype2, applyvalue2, " - "value0, value1, value2, value3, value4, value5 ) " - "values (" - "%d, %d, %d, \"%s\", \"%s\", %d, %d, %d, %d, " - "%d, %d, %d, %d, " - "%d, %d, %d, %d, %d, " - "%d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d )", - GetTablePostfix(), g_stLocaleNameColumn.c_str(), - t.dwVnum, t.bType, t.bSubType, t.szName, t.szLocaleName, t.dwGold, t.dwShopBuyPrice, t.bWeight, t.bSize, - t.dwFlags, t.dwWearFlags, t.dwAntiFlags, t.dwImmuneFlag, - t.dwRefinedVnum, t.wRefineSet, t.bAlterToMagicItemPct, t.bGainSocketPct, t.sAddonType, - t.aLimits[0].bType, t.aLimits[0].lValue, t.aLimits[1].bType, t.aLimits[1].lValue, - t.aApplies[0].bType, t.aApplies[0].lValue, t.aApplies[1].bType, t.aApplies[1].lValue, t.aApplies[2].bType, t.aApplies[2].lValue, - t.alValues[0], t.alValues[1], t.alValues[2], t.alValues[3], t.alValues[4], t.alValues[5]); + "replace into item_proto%s (" + "vnum, type, subtype, name, %s, gold, shop_buy_price, weight, size, " + "flag, wearflag, antiflag, immuneflag, " + "refined_vnum, refine_set, magic_pct, socket_pct, addon_type, " + "limittype0, limitvalue0, limittype1, limitvalue1, " + "applytype0, applyvalue0, applytype1, applyvalue1, applytype2, applyvalue2, " + "value0, value1, value2, value3, value4, value5 ) " + "values (" + "%d, %d, %d, \"%s\", \"%s\", %d, %d, %d, %d, " + "%d, %d, %d, %d, " + "%d, %d, %d, %d, %d, " + "%d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d )", + GetTablePostfix(), g_stLocaleNameColumn.c_str(), + t.dwVnum, t.bType, t.bSubType, t.szName, t.szLocaleName, t.dwGold, t.dwShopBuyPrice, t.bWeight, t.bSize, + t.dwFlags, t.dwWearFlags, t.dwAntiFlags, t.dwImmuneFlag, + t.dwRefinedVnum, t.wRefineSet, t.bAlterToMagicItemPct, t.bGainSocketPct, t.sAddonType, + t.aLimits[0].bType, t.aLimits[0].lValue, t.aLimits[1].bType, t.aLimits[1].lValue, + t.aApplies[0].bType, t.aApplies[0].lValue, t.aApplies[1].bType, t.aApplies[1].lValue, t.aApplies[2].bType, t.aApplies[2].lValue, + t.alValues[0], t.alValues[1], t.alValues[2], t.alValues[3], t.alValues[4], t.alValues[5]); CDBManager::instance().AsyncQuery(query); } else { - const TItemTable& t = *it; + const TItemTable &t = *it; char query[4096]; snprintf(query, sizeof(query), - "replace into item_proto%s (" - "vnum, type, subtype, name, gold, shop_buy_price, weight, size, " - "flag, wearflag, antiflag, immuneflag, " - "refined_vnum, refine_set, magic_pct, socket_pct, addon_type, " - "limittype0, limitvalue0, limittype1, limitvalue1, " - "applytype0, applyvalue0, applytype1, applyvalue1, applytype2, applyvalue2, " - "value0, value1, value2, value3, value4, value5 ) " - "values (" - "%d, %d, %d, \"%s\", %d, %d, %d, %d, " - "%d, %d, %d, %d, " - "%d, %d, %d, %d, %d, " - "%d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d )", - GetTablePostfix(), - t.dwVnum, t.bType, t.bSubType, t.szName, t.dwGold, t.dwShopBuyPrice, t.bWeight, t.bSize, - t.dwFlags, t.dwWearFlags, t.dwAntiFlags, t.dwImmuneFlag, - t.dwRefinedVnum, t.wRefineSet, t.bAlterToMagicItemPct, t.bGainSocketPct, t.sAddonType, - t.aLimits[0].bType, t.aLimits[0].lValue, t.aLimits[1].bType, t.aLimits[1].lValue, - t.aApplies[0].bType, t.aApplies[0].lValue, t.aApplies[1].bType, t.aApplies[1].lValue, t.aApplies[2].bType, t.aApplies[2].lValue, - t.alValues[0], t.alValues[1], t.alValues[2], t.alValues[3], t.alValues[4], t.alValues[5]); + "replace into item_proto%s (" + "vnum, type, subtype, name, gold, shop_buy_price, weight, size, " + "flag, wearflag, antiflag, immuneflag, " + "refined_vnum, refine_set, magic_pct, socket_pct, addon_type, " + "limittype0, limitvalue0, limittype1, limitvalue1, " + "applytype0, applyvalue0, applytype1, applyvalue1, applytype2, applyvalue2, " + "value0, value1, value2, value3, value4, value5 ) " + "values (" + "%d, %d, %d, \"%s\", %d, %d, %d, %d, " + "%d, %d, %d, %d, " + "%d, %d, %d, %d, %d, " + "%d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d )", + GetTablePostfix(), + t.dwVnum, t.bType, t.bSubType, t.szName, t.dwGold, t.dwShopBuyPrice, t.bWeight, t.bSize, + t.dwFlags, t.dwWearFlags, t.dwAntiFlags, t.dwImmuneFlag, + t.dwRefinedVnum, t.wRefineSet, t.bAlterToMagicItemPct, t.bGainSocketPct, t.sAddonType, + t.aLimits[0].bType, t.aLimits[0].lValue, t.aLimits[1].bType, t.aLimits[1].lValue, + t.aApplies[0].bType, t.aApplies[0].lValue, t.aApplies[1].bType, t.aApplies[1].lValue, t.aApplies[2].bType, t.aApplies[2].lValue, + t.alValues[0], t.alValues[1], t.alValues[2], t.alValues[3], t.alValues[4], t.alValues[5]); CDBManager::instance().AsyncQuery(query); } } diff --git a/src/db/src/ClientManagerEventFlag.cpp b/src/db/src/ClientManagerEventFlag.cpp index 1d6eb54..e09731d 100644 --- a/src/db/src/ClientManagerEventFlag.cpp +++ b/src/db/src/ClientManagerEventFlag.cpp @@ -12,7 +12,7 @@ void CClientManager::LoadEventFlag() snprintf(szQuery, sizeof(szQuery), "SELECT szName, lValue FROM quest%s WHERE dwPID = 0", GetTablePostfix()); std::unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult* pRes = pmsg->Get(); + SQLResult *pRes = pmsg->Get(); if (pRes->uiNumRows) { MYSQL_ROW row; @@ -28,7 +28,7 @@ void CClientManager::LoadEventFlag() } } -void CClientManager::SetEventFlag(TPacketSetEventFlag* p) +void CClientManager::SetEventFlag(TPacketSetEventFlag *p) { ForwardPacket(HEADER_DG_SET_EVENT_FLAG, p, sizeof(TPacketSetEventFlag)); @@ -50,11 +50,11 @@ void CClientManager::SetEventFlag(TPacketSetEventFlag* p) { char szQuery[1024]; snprintf(szQuery, sizeof(szQuery), - "REPLACE INTO quest%s (dwPID, szName, szState, lValue) VALUES(0, '%s', '', %d)", - GetTablePostfix(), p->szFlagName, p->lValue); + "REPLACE INTO quest%s (dwPID, szName, szState, lValue) VALUES(0, '%s', '', %d)", + GetTablePostfix(), p->szFlagName, p->lValue); szQuery[1023] = '\0'; - //CDBManager::instance().ReturnQuery(szQuery, QID_QUEST_SAVE, 0, NULL); + // CDBManager::instance().ReturnQuery(szQuery, QID_QUEST_SAVE, 0, NULL); CDBManager::instance().AsyncQuery(szQuery); SPDLOG_DEBUG("HEADER_GD_SET_EVENT_FLAG : Changed CClientmanager::SetEventFlag({} {}) ", p->szFlagName, p->lValue); return; @@ -62,7 +62,7 @@ void CClientManager::SetEventFlag(TPacketSetEventFlag* p) SPDLOG_DEBUG("HEADER_GD_SET_EVENT_FLAG : No Changed CClientmanager::SetEventFlag({} {}) ", p->szFlagName, p->lValue); } -void CClientManager::SendEventFlagsOnSetup(CPeer* peer) +void CClientManager::SendEventFlagsOnSetup(CPeer *peer) { typeof(m_map_lEventFlag.begin()) it; for (it = m_map_lEventFlag.begin(); it != m_map_lEventFlag.end(); ++it) @@ -74,4 +74,3 @@ void CClientManager::SendEventFlagsOnSetup(CPeer* peer) peer->Encode(&p, sizeof(TPacketSetEventFlag)); } } - diff --git a/src/db/src/ClientManagerGuild.cpp b/src/db/src/ClientManagerGuild.cpp index 47f1fe6..eae9780 100644 --- a/src/db/src/ClientManagerGuild.cpp +++ b/src/db/src/ClientManagerGuild.cpp @@ -7,8 +7,7 @@ #include "QID.h" #include "GuildManager.h" - -void CClientManager::GuildCreate(CPeer * peer, DWORD dwGuildID) +void CClientManager::GuildCreate(CPeer *peer, DWORD dwGuildID) { SPDLOG_DEBUG("GuildCreate {}", dwGuildID); ForwardPacket(HEADER_DG_GUILD_LOAD, &dwGuildID, sizeof(DWORD)); @@ -16,27 +15,27 @@ void CClientManager::GuildCreate(CPeer * peer, DWORD dwGuildID) CGuildManager::instance().Load(dwGuildID); } -void CClientManager::GuildChangeGrade(CPeer* peer, TPacketGuild* p) +void CClientManager::GuildChangeGrade(CPeer *peer, TPacketGuild *p) { SPDLOG_DEBUG("GuildChangeGrade {} {}", p->dwGuild, p->dwInfo); ForwardPacket(HEADER_DG_GUILD_CHANGE_GRADE, p, sizeof(TPacketGuild)); } -void CClientManager::GuildAddMember(CPeer* peer, TPacketGDGuildAddMember * p) +void CClientManager::GuildAddMember(CPeer *peer, TPacketGDGuildAddMember *p) { CGuildManager::instance().TouchGuild(p->dwGuild); SPDLOG_DEBUG("GuildAddMember {} {}", p->dwGuild, p->dwPID); char szQuery[512]; - snprintf(szQuery, sizeof(szQuery), - "INSERT INTO guild_member%s VALUES(%u, %u, %d, 0, 0)", - GetTablePostfix(), p->dwPID, p->dwGuild, p->bGrade); + snprintf(szQuery, sizeof(szQuery), + "INSERT INTO guild_member%s VALUES(%u, %u, %d, 0, 0)", + GetTablePostfix(), p->dwPID, p->dwGuild, p->bGrade); std::unique_ptr pmsg_insert(CDBManager::instance().DirectQuery(szQuery)); - snprintf(szQuery, sizeof(szQuery), - "SELECT pid, grade, is_general, offer, level, job, name FROM guild_member%s, player%s WHERE guild_id = %u and pid = id and pid = %u", GetTablePostfix(), GetTablePostfix(), p->dwGuild, p->dwPID); + snprintf(szQuery, sizeof(szQuery), + "SELECT pid, grade, is_general, offer, level, job, name FROM guild_member%s, player%s WHERE guild_id = %u and pid = id and pid = %u", GetTablePostfix(), GetTablePostfix(), p->dwGuild, p->dwPID); std::unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); @@ -65,7 +64,7 @@ void CClientManager::GuildAddMember(CPeer* peer, TPacketGDGuildAddMember * p) ForwardPacket(HEADER_DG_GUILD_ADD_MEMBER, &dg, sizeof(TPacketDGGuildMember)); } -void CClientManager::GuildRemoveMember(CPeer* peer, TPacketGuild* p) +void CClientManager::GuildRemoveMember(CPeer *peer, TPacketGuild *p) { SPDLOG_DEBUG("GuildRemoveMember {} {}", p->dwGuild, p->dwInfo); @@ -73,31 +72,31 @@ void CClientManager::GuildRemoveMember(CPeer* peer, TPacketGuild* p) snprintf(szQuery, sizeof(szQuery), "DELETE FROM guild_member%s WHERE pid=%u and guild_id=%u", GetTablePostfix(), p->dwInfo, p->dwGuild); CDBManager::instance().AsyncQuery(szQuery); - snprintf(szQuery, sizeof(szQuery), "REPLACE INTO quest%s (dwPID, szName, szState, lValue) VALUES(%u, 'guild_manage', 'withdraw_time', %u)", GetTablePostfix(), p->dwInfo, (DWORD) GetCurrentTime()); + snprintf(szQuery, sizeof(szQuery), "REPLACE INTO quest%s (dwPID, szName, szState, lValue) VALUES(%u, 'guild_manage', 'withdraw_time', %u)", GetTablePostfix(), p->dwInfo, (DWORD)GetCurrentTime()); CDBManager::instance().AsyncQuery(szQuery); ForwardPacket(HEADER_DG_GUILD_REMOVE_MEMBER, p, sizeof(TPacketGuild)); } -void CClientManager::GuildSkillUpdate(CPeer* peer, TPacketGuildSkillUpdate* p) +void CClientManager::GuildSkillUpdate(CPeer *peer, TPacketGuildSkillUpdate *p) { SPDLOG_DEBUG("GuildSkillUpdate {}", p->amount); ForwardPacket(HEADER_DG_GUILD_SKILL_UPDATE, p, sizeof(TPacketGuildSkillUpdate)); } -void CClientManager::GuildExpUpdate(CPeer* peer, TPacketGuildExpUpdate* p) +void CClientManager::GuildExpUpdate(CPeer *peer, TPacketGuildExpUpdate *p) { SPDLOG_DEBUG("GuildExpUpdate {}", p->amount); ForwardPacket(HEADER_DG_GUILD_EXP_UPDATE, p, sizeof(TPacketGuildExpUpdate), 0, peer); } -void CClientManager::GuildChangeMemberData(CPeer* peer, TPacketGuildChangeMemberData* p) +void CClientManager::GuildChangeMemberData(CPeer *peer, TPacketGuildChangeMemberData *p) { SPDLOG_DEBUG("GuildChangeMemberData {} {} {} {}", p->pid, p->offer, p->level, p->grade); ForwardPacket(HEADER_DG_GUILD_CHANGE_MEMBER_DATA, p, sizeof(TPacketGuildChangeMemberData), 0, peer); } -void CClientManager::GuildDisband(CPeer* peer, TPacketGuild* p) +void CClientManager::GuildDisband(CPeer *peer, TPacketGuild *p) { SPDLOG_DEBUG("GuildDisband {}", p->dwGuild); @@ -109,107 +108,107 @@ void CClientManager::GuildDisband(CPeer* peer, TPacketGuild* p) snprintf(szQuery, sizeof(szQuery), "DELETE FROM guild_grade%s WHERE guild_id=%u", GetTablePostfix(), p->dwGuild); CDBManager::instance().AsyncQuery(szQuery); - snprintf(szQuery, sizeof(szQuery), "REPLACE INTO quest%s (dwPID, szName, szState, lValue) SELECT pid, 'guild_manage', 'withdraw_time', %u FROM guild_member%s WHERE guild_id = %u", GetTablePostfix(), (DWORD) GetCurrentTime(), GetTablePostfix(), p->dwGuild); + snprintf(szQuery, sizeof(szQuery), "REPLACE INTO quest%s (dwPID, szName, szState, lValue) SELECT pid, 'guild_manage', 'withdraw_time', %u FROM guild_member%s WHERE guild_id = %u", GetTablePostfix(), (DWORD)GetCurrentTime(), GetTablePostfix(), p->dwGuild); CDBManager::instance().AsyncQuery(szQuery); snprintf(szQuery, sizeof(szQuery), "DELETE FROM guild_member%s WHERE guild_id=%u", GetTablePostfix(), p->dwGuild); CDBManager::instance().AsyncQuery(szQuery); - + snprintf(szQuery, sizeof(szQuery), "DELETE FROM guild_comment%s WHERE guild_id=%u", GetTablePostfix(), p->dwGuild); CDBManager::instance().AsyncQuery(szQuery); ForwardPacket(HEADER_DG_GUILD_DISBAND, p, sizeof(TPacketGuild)); } -const char* __GetWarType(int n) +const char *__GetWarType(int n) { switch (n) { - case 0 : - return "\xEF\xBF\xBD\xD0\xBF\xEF\xBF\xBD"; // 패왕 - case 1 : - return "\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD"; // 맹장 - case 2 : - return "\xEF\xBF\xBD\xEF\xBF\xBD\xC8\xA3"; // 수호 - default : - return "\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD\x20\xEF\xBF\xBD\xEF\xBF\xBD\xC8\xA3"; // 없는 번호 + case 0: + return "\xEF\xBF\xBD\xD0\xBF\xEF\xBF\xBD"; // 패왕 + case 1: + return "\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD"; // 맹장 + case 2: + return "\xEF\xBF\xBD\xEF\xBF\xBD\xC8\xA3"; // 수호 + default: + return "\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD\xEF\xBF\xBD\x20\xEF\xBF\xBD\xEF\xBF\xBD\xC8\xA3"; // 없는 번호 } } -void CClientManager::GuildWar(CPeer* peer, TPacketGuildWar* p) +void CClientManager::GuildWar(CPeer *peer, TPacketGuildWar *p) { switch (p->bWar) { - case GUILD_WAR_SEND_DECLARE: - SPDLOG_DEBUG("GuildWar: GUILD_WAR_SEND_DECLARE type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); - CGuildManager::instance().AddDeclare(p->bType, p->dwGuildFrom, p->dwGuildTo); - break; + case GUILD_WAR_SEND_DECLARE: + SPDLOG_DEBUG("GuildWar: GUILD_WAR_SEND_DECLARE type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); + CGuildManager::instance().AddDeclare(p->bType, p->dwGuildFrom, p->dwGuildTo); + break; - case GUILD_WAR_REFUSE: - SPDLOG_DEBUG("GuildWar: GUILD_WAR_REFUSE type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); - CGuildManager::instance().RemoveDeclare(p->dwGuildFrom, p->dwGuildTo); - break; - /* - case GUILD_WAR_WAIT_START: - CGuildManager::instance().RemoveDeclare(p->dwGuildFrom, p->dwGuildTo); + case GUILD_WAR_REFUSE: + SPDLOG_DEBUG("GuildWar: GUILD_WAR_REFUSE type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); + CGuildManager::instance().RemoveDeclare(p->dwGuildFrom, p->dwGuildTo); + break; + /* + case GUILD_WAR_WAIT_START: + CGuildManager::instance().RemoveDeclare(p->dwGuildFrom, p->dwGuildTo); - if (!CGuildManager::instance().WaitStart(p)) - p->bWar = GUILD_WAR_CANCEL; + if (!CGuildManager::instance().WaitStart(p)) + p->bWar = GUILD_WAR_CANCEL; - break; - */ + break; + */ - case GUILD_WAR_WAIT_START: - SPDLOG_DEBUG("GuildWar: GUILD_WAR_WAIT_START type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); - case GUILD_WAR_RESERVE: // 길드전 예약 - if (p->bWar != GUILD_WAR_WAIT_START) - SPDLOG_DEBUG("GuildWar: GUILD_WAR_RESERVE type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); - CGuildManager::instance().RemoveDeclare(p->dwGuildFrom, p->dwGuildTo); + case GUILD_WAR_WAIT_START: + SPDLOG_DEBUG("GuildWar: GUILD_WAR_WAIT_START type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); + case GUILD_WAR_RESERVE: // 길드전 예약 + if (p->bWar != GUILD_WAR_WAIT_START) + SPDLOG_DEBUG("GuildWar: GUILD_WAR_RESERVE type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); + CGuildManager::instance().RemoveDeclare(p->dwGuildFrom, p->dwGuildTo); - if (!CGuildManager::instance().ReserveWar(p)) - p->bWar = GUILD_WAR_CANCEL; - else - p->bWar = GUILD_WAR_RESERVE; + if (!CGuildManager::instance().ReserveWar(p)) + p->bWar = GUILD_WAR_CANCEL; + else + p->bWar = GUILD_WAR_RESERVE; - break; + break; - case GUILD_WAR_ON_WAR: // 길드전을 시작 시킨다. (필드전은 바로 시작 됨) - SPDLOG_DEBUG("GuildWar: GUILD_WAR_ON_WAR type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); - CGuildManager::instance().RemoveDeclare(p->dwGuildFrom, p->dwGuildTo); - CGuildManager::instance().StartWar(p->bType, p->dwGuildFrom, p->dwGuildTo); - break; + case GUILD_WAR_ON_WAR: // 길드전을 시작 시킨다. (필드전은 바로 시작 됨) + SPDLOG_DEBUG("GuildWar: GUILD_WAR_ON_WAR type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); + CGuildManager::instance().RemoveDeclare(p->dwGuildFrom, p->dwGuildTo); + CGuildManager::instance().StartWar(p->bType, p->dwGuildFrom, p->dwGuildTo); + break; - case GUILD_WAR_OVER: // 길드전 정상 종료 - SPDLOG_DEBUG("GuildWar: GUILD_WAR_OVER type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); - CGuildManager::instance().RecvWarOver(p->dwGuildFrom, p->dwGuildTo, p->bType, p->lWarPrice); - break; + case GUILD_WAR_OVER: // 길드전 정상 종료 + SPDLOG_DEBUG("GuildWar: GUILD_WAR_OVER type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); + CGuildManager::instance().RecvWarOver(p->dwGuildFrom, p->dwGuildTo, p->bType, p->lWarPrice); + break; - case GUILD_WAR_END: // 길드전 비정상 종료 - SPDLOG_DEBUG("GuildWar: GUILD_WAR_END type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); - CGuildManager::instance().RecvWarEnd(p->dwGuildFrom, p->dwGuildTo); - return; // NOTE: RecvWarEnd에서 패킷을 보내므로 따로 브로드캐스팅 하지 않는다. + case GUILD_WAR_END: // 길드전 비정상 종료 + SPDLOG_DEBUG("GuildWar: GUILD_WAR_END type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); + CGuildManager::instance().RecvWarEnd(p->dwGuildFrom, p->dwGuildTo); + return; // NOTE: RecvWarEnd에서 패킷을 보내므로 따로 브로드캐스팅 하지 않는다. - case GUILD_WAR_CANCEL : - SPDLOG_DEBUG("GuildWar: GUILD_WAR_CANCEL type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); - CGuildManager::instance().CancelWar(p->dwGuildFrom, p->dwGuildTo); - break; + case GUILD_WAR_CANCEL: + SPDLOG_DEBUG("GuildWar: GUILD_WAR_CANCEL type({}) guild({} - {})", __GetWarType(p->bType), p->dwGuildFrom, p->dwGuildTo); + CGuildManager::instance().CancelWar(p->dwGuildFrom, p->dwGuildTo); + break; } ForwardPacket(HEADER_DG_GUILD_WAR, p, sizeof(TPacketGuildWar)); } -void CClientManager::GuildWarScore(CPeer* peer, TPacketGuildWarScore * p) +void CClientManager::GuildWarScore(CPeer *peer, TPacketGuildWarScore *p) { CGuildManager::instance().UpdateScore(p->dwGuildGainPoint, p->dwGuildOpponent, p->lScore, p->lBetScore); } -void CClientManager::GuildChangeLadderPoint(TPacketGuildLadderPoint* p) +void CClientManager::GuildChangeLadderPoint(TPacketGuildLadderPoint *p) { SPDLOG_DEBUG("GuildChangeLadderPoint Recv {} {}", p->dwGuild, p->lChange); CGuildManager::instance().ChangeLadderPoint(p->dwGuild, p->lChange); } -void CClientManager::GuildUseSkill(TPacketGuildUseSkill* p) +void CClientManager::GuildUseSkill(TPacketGuildUseSkill *p) { SPDLOG_DEBUG("GuildUseSkill Recv {} {}", p->dwGuild, p->dwSkillVnum); CGuildManager::instance().UseSkill(p->dwGuild, p->dwSkillVnum, p->dwCooltime); @@ -218,7 +217,7 @@ void CClientManager::GuildUseSkill(TPacketGuildUseSkill* p) void CClientManager::SendGuildSkillUsable(DWORD guild_id, DWORD dwSkillVnum, bool bUsable) { - SPDLOG_DEBUG("SendGuildSkillUsable Send {} {} {}", guild_id, dwSkillVnum, bUsable?"true":"false"); + SPDLOG_DEBUG("SendGuildSkillUsable Send {} {} {}", guild_id, dwSkillVnum, bUsable ? "true" : "false"); TPacketGuildSkillUsableChange p; @@ -229,7 +228,7 @@ void CClientManager::SendGuildSkillUsable(DWORD guild_id, DWORD dwSkillVnum, boo ForwardPacket(HEADER_DG_GUILD_SKILL_USABLE_CHANGE, &p, sizeof(TPacketGuildSkillUsableChange)); } -void CClientManager::GuildChangeMaster(TPacketChangeGuildMaster* p) +void CClientManager::GuildChangeMaster(TPacketChangeGuildMaster *p) { if (CGuildManager::instance().ChangeMaster(p->dwGuildID, p->idFrom, p->idTo) == true) { @@ -241,4 +240,3 @@ void CClientManager::GuildChangeMaster(TPacketChangeGuildMaster* p) ForwardPacket(HEADER_DG_ACK_CHANGE_GUILD_MASTER, &packet, sizeof(packet)); } } - diff --git a/src/db/src/ClientManagerHorseName.cpp b/src/db/src/ClientManagerHorseName.cpp index 6c794a9..567ca67 100644 --- a/src/db/src/ClientManagerHorseName.cpp +++ b/src/db/src/ClientManagerHorseName.cpp @@ -2,7 +2,7 @@ #include "stdafx.h" #include "ClientManager.h" -void CClientManager::UpdateHorseName(TPacketUpdateHorseName* data, CPeer* peer) +void CClientManager::UpdateHorseName(TPacketUpdateHorseName *data, CPeer *peer) { char szQuery[512]; @@ -13,7 +13,7 @@ void CClientManager::UpdateHorseName(TPacketUpdateHorseName* data, CPeer* peer) ForwardPacket(HEADER_DG_UPDATE_HORSE_NAME, data, sizeof(TPacketUpdateHorseName), 0, peer); } -void CClientManager::AckHorseName(DWORD dwPID, CPeer* peer) +void CClientManager::AckHorseName(DWORD dwPID, CPeer *peer) { char szQuery[512]; @@ -26,7 +26,7 @@ void CClientManager::AckHorseName(DWORD dwPID, CPeer* peer) if (pmsg->Get()->uiNumRows == 0) { - memset(packet.szHorseName, 0, sizeof (packet.szHorseName)); + memset(packet.szHorseName, 0, sizeof(packet.szHorseName)); } else { @@ -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)); } - diff --git a/src/db/src/ClientManagerLogin.cpp b/src/db/src/ClientManagerLogin.cpp index 9db1aa1..86dfbd0 100644 --- a/src/db/src/ClientManagerLogin.cpp +++ b/src/db/src/ClientManagerLogin.cpp @@ -9,10 +9,10 @@ #include "Cache.h" extern std::string g_stLocale; -extern bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab); +extern bool CreatePlayerTableFromRes(MYSQL_RES *res, TPlayerTable *pkTab); extern int g_test_server; -bool CClientManager::InsertLogonAccount(const char * c_pszLogin, DWORD dwHandle, const char * c_pszIP) +bool CClientManager::InsertLogonAccount(const char *c_pszLogin, DWORD dwHandle, const char *c_pszIP) { char szLogin[LOGIN_MAX_LEN + 1]; trim_and_lower(c_pszLogin, szLogin, sizeof(szLogin)); @@ -22,7 +22,7 @@ bool CClientManager::InsertLogonAccount(const char * c_pszLogin, DWORD dwHandle, if (m_map_kLogonAccount.end() != it) return false; - CLoginData * pkLD = GetLoginDataByLogin(c_pszLogin); + CLoginData *pkLD = GetLoginDataByLogin(c_pszLogin); if (!pkLD) return false; @@ -34,7 +34,7 @@ bool CClientManager::InsertLogonAccount(const char * c_pszLogin, DWORD dwHandle, return true; } -bool CClientManager::DeleteLogonAccount(const char * c_pszLogin, DWORD dwHandle) +bool CClientManager::DeleteLogonAccount(const char *c_pszLogin, DWORD dwHandle) { char szLogin[LOGIN_MAX_LEN + 1]; trim_and_lower(c_pszLogin, szLogin, sizeof(szLogin)); @@ -44,7 +44,7 @@ bool CClientManager::DeleteLogonAccount(const char * c_pszLogin, DWORD dwHandle) if (it == m_map_kLogonAccount.end()) return false; - CLoginData * pkLD = it->second; + CLoginData *pkLD = it->second; if (pkLD->GetConnectedPeerHandle() != dwHandle) { @@ -66,7 +66,7 @@ bool CClientManager::DeleteLogonAccount(const char * c_pszLogin, DWORD dwHandle) return true; } -bool CClientManager::FindLogonAccount(const char * c_pszLogin) +bool CClientManager::FindLogonAccount(const char *c_pszLogin) { char szLogin[LOGIN_MAX_LEN + 1]; trim_and_lower(c_pszLogin, szLogin, sizeof(szLogin)); @@ -77,9 +77,9 @@ bool CClientManager::FindLogonAccount(const char * c_pszLogin) return true; } -void CClientManager::QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketGDLoginByKey * p) +void CClientManager::QUERY_LOGIN_BY_KEY(CPeer *pkPeer, DWORD dwHandle, TPacketGDLoginByKey *p) { - CLoginData * pkLoginData = GetLoginData(p->dwLoginKey); + CLoginData *pkLoginData = GetLoginData(p->dwLoginKey); char szLogin[LOGIN_MAX_LEN + 1]; trim_and_lower(p->szLogin, szLogin, sizeof(szLogin)); @@ -90,7 +90,7 @@ void CClientManager::QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketG return; } - TAccountTable & r = pkLoginData->GetAccountRef(); + TAccountTable &r = pkLoginData->GetAccountRef(); if (FindLogonAccount(r.login)) { @@ -111,18 +111,18 @@ void CClientManager::QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketG if (memcmp(pkLoginData->GetClientKey(), p->adwClientKey, sizeof(DWORD) * 4)) { - const DWORD * pdwClientKey = pkLoginData->GetClientKey(); + const DWORD *pdwClientKey = pkLoginData->GetClientKey(); SPDLOG_DEBUG("LOGIN_BY_KEY client key differ {} {} {} {} {}, {} {} {} {}", - r.login, - p->adwClientKey[0], p->adwClientKey[1], p->adwClientKey[2], p->adwClientKey[3], - pdwClientKey[0], pdwClientKey[1], pdwClientKey[2], pdwClientKey[3]); + r.login, + p->adwClientKey[0], p->adwClientKey[1], p->adwClientKey[2], p->adwClientKey[3], + pdwClientKey[0], pdwClientKey[1], pdwClientKey[2], pdwClientKey[3]); pkPeer->EncodeReturn(HEADER_DG_LOGIN_NOT_EXIST, dwHandle); return; } - TAccountTable * pkTab = new TAccountTable; + TAccountTable *pkTab = new TAccountTable; memset(pkTab, 0, sizeof(TAccountTable)); pkTab->id = r.id; @@ -131,7 +131,7 @@ void CClientManager::QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketG strlcpy(pkTab->social_id, r.social_id, sizeof(pkTab->social_id)); strlcpy(pkTab->status, "OK", sizeof(pkTab->status)); - ClientHandleInfo * info = new ClientHandleInfo(dwHandle); + ClientHandleInfo *info = new ClientHandleInfo(dwHandle); info->pAccountTable = pkTab; strlcpy(info->ip, p->szIP, sizeof(info->ip)); @@ -141,10 +141,10 @@ void CClientManager::QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketG CDBManager::instance().ReturnQuery(szQuery, QID_LOGIN_BY_KEY, pkPeer->GetHandle(), info); } -void CClientManager::RESULT_LOGIN_BY_KEY(CPeer * peer, SQLMsg * msg) +void CClientManager::RESULT_LOGIN_BY_KEY(CPeer *peer, SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - ClientHandleInfo * info = (ClientHandleInfo *) qi->pvData; + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + ClientHandleInfo *info = (ClientHandleInfo *)qi->pvData; if (msg->uiSQLErrno != 0) { @@ -161,7 +161,7 @@ void CClientManager::RESULT_LOGIN_BY_KEY(CPeer * peer, SQLMsg * msg) char szQuery[QUERY_MAX_LEN]; snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, empire FROM player_index%s WHERE id=%u", GetTablePostfix(), account_id); std::unique_ptr pMsg(CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER)); - + SPDLOG_DEBUG("RESULT_LOGIN_BY_KEY FAIL player_index's NULL : ID:{}", account_id); if (pMsg->Get()->uiNumRows == 0) @@ -169,7 +169,7 @@ void CClientManager::RESULT_LOGIN_BY_KEY(CPeer * peer, SQLMsg * msg) SPDLOG_DEBUG("RESULT_LOGIN_BY_KEY FAIL player_index's NULL : ID:{}", account_id); // PLAYER_INDEX_CREATE_BUG_FIX - //snprintf(szQuery, sizeof(szQuery), "INSERT IGNORE INTO player_index%s (id) VALUES(%lu)", GetTablePostfix(), info->pAccountTable->id); + // snprintf(szQuery, sizeof(szQuery), "INSERT IGNORE INTO player_index%s (id) VALUES(%lu)", GetTablePostfix(), info->pAccountTable->id); snprintf(szQuery, sizeof(szQuery), "INSERT INTO player_index%s (id) VALUES(%u)", GetTablePostfix(), info->pAccountTable->id); CDBManager::instance().ReturnQuery(szQuery, QID_PLAYER_INDEX_CREATE, peer->GetHandle(), info); // END_PLAYER_INDEX_CREATE_BUF_FIX @@ -191,33 +191,33 @@ void CClientManager::RESULT_LOGIN_BY_KEY(CPeer * peer, SQLMsg * msg) if (g_stLocale == "gb2312") { snprintf(szQuery, sizeof(szQuery), - "SELECT id, name, job, level, alignment, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u", - GetTablePostfix(), info->pAccountTable->id); + "SELECT id, name, job, level, alignment, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u", + GetTablePostfix(), info->pAccountTable->id); } else { snprintf(szQuery, sizeof(szQuery), - "SELECT id, name, job, level, playtime, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u", - GetTablePostfix(), info->pAccountTable->id); + "SELECT id, name, job, level, playtime, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u", + GetTablePostfix(), info->pAccountTable->id); } CDBManager::instance().ReturnQuery(szQuery, QID_LOGIN, peer->GetHandle(), info); } // PLAYER_INDEX_CREATE_BUG_FIX -void CClientManager::RESULT_PLAYER_INDEX_CREATE(CPeer * pkPeer, SQLMsg * msg) +void CClientManager::RESULT_PLAYER_INDEX_CREATE(CPeer *pkPeer, SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - ClientHandleInfo * info = (ClientHandleInfo *) qi->pvData; + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + ClientHandleInfo *info = (ClientHandleInfo *)qi->pvData; char szQuery[QUERY_MAX_LEN]; - snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, empire FROM player_index%s WHERE id=%u", GetTablePostfix(), - info->pAccountTable->id); + snprintf(szQuery, sizeof(szQuery), "SELECT pid1, pid2, pid3, pid4, empire FROM player_index%s WHERE id=%u", GetTablePostfix(), + info->pAccountTable->id); CDBManager::instance().ReturnQuery(szQuery, QID_LOGIN_BY_KEY, pkPeer->GetHandle(), info); } // END_PLAYER_INDEX_CREATE_BUG_FIX -TAccountTable * CreateAccountTableFromRes(MYSQL_RES * res) +TAccountTable *CreateAccountTableFromRes(MYSQL_RES *res) { char input_pwd[PASSWD_MAX_LEN + 1]; MYSQL_ROW row = NULL; @@ -226,7 +226,7 @@ TAccountTable * CreateAccountTableFromRes(MYSQL_RES * res) row = mysql_fetch_row(res); col = 0; - TAccountTable * pkTab = new TAccountTable; + TAccountTable *pkTab = new TAccountTable; memset(pkTab, 0, sizeof(TAccountTable)); // 첫번째 컬럼 것만 참고 한다 (JOIN QUERY를 위한 것 임) @@ -251,7 +251,7 @@ TAccountTable * CreateAccountTableFromRes(MYSQL_RES * res) return pkTab; } -void CreateAccountPlayerDataFromRes(MYSQL_RES * pRes, TAccountTable * pkTab) +void CreateAccountPlayerDataFromRes(MYSQL_RES *pRes, TAccountTable *pkTab) { if (!pRes) return; @@ -273,26 +273,26 @@ void CreateAccountPlayerDataFromRes(MYSQL_RES * pRes, TAccountTable * pkTab) { if (pkTab->players[j].dwID == player_id) { - CPlayerTableCache * pc = CClientManager::instance().GetPlayerCache(player_id); - TPlayerTable * pt = pc ? pc->Get(false) : NULL; + CPlayerTableCache *pc = CClientManager::instance().GetPlayerCache(player_id); + TPlayerTable *pt = pc ? pc->Get(false) : NULL; if (pt) { strlcpy(pkTab->players[j].szName, pt->name, sizeof(pkTab->players[j].szName)); - pkTab->players[j].byJob = pt->job; - pkTab->players[j].byLevel = pt->level; - pkTab->players[j].dwPlayMinutes = pt->playtime; - pkTab->players[j].byST = pt->st; - pkTab->players[j].byHT = pt->ht; - pkTab->players[j].byDX = pt->dx; - pkTab->players[j].byIQ = pt->iq; - pkTab->players[j].wMainPart = pt->parts[PART_MAIN]; - pkTab->players[j].wHairPart = pt->parts[PART_HAIR]; - pkTab->players[j].x = pt->x; - pkTab->players[j].y = pt->y; - pkTab->players[j].skill_group = pt->skill_group; - pkTab->players[j].bChangeName = 0; + pkTab->players[j].byJob = pt->job; + pkTab->players[j].byLevel = pt->level; + pkTab->players[j].dwPlayMinutes = pt->playtime; + pkTab->players[j].byST = pt->st; + pkTab->players[j].byHT = pt->ht; + pkTab->players[j].byDX = pt->dx; + pkTab->players[j].byIQ = pt->iq; + pkTab->players[j].wMainPart = pt->parts[PART_MAIN]; + pkTab->players[j].wHairPart = pt->parts[PART_HAIR]; + pkTab->players[j].x = pt->x; + pkTab->players[j].y = pt->y; + pkTab->players[j].skill_group = pt->skill_group; + pkTab->players[j].bChangeName = 0; } else { @@ -301,19 +301,19 @@ void CreateAccountPlayerDataFromRes(MYSQL_RES * pRes, TAccountTable * pkTab) else strlcpy(pkTab->players[j].szName, row[col - 1], sizeof(pkTab->players[j].szName)); - pkTab->players[j].byJob = 0; - pkTab->players[j].byLevel = 0; - pkTab->players[j].dwPlayMinutes = 0; - pkTab->players[j].byST = 0; - pkTab->players[j].byHT = 0; - pkTab->players[j].byDX = 0; - pkTab->players[j].byIQ = 0; - pkTab->players[j].wMainPart = 0; - pkTab->players[j].wHairPart = 0; - pkTab->players[j].x = 0; - pkTab->players[j].y = 0; - pkTab->players[j].skill_group = 0; - pkTab->players[j].bChangeName = 0; + pkTab->players[j].byJob = 0; + pkTab->players[j].byLevel = 0; + pkTab->players[j].dwPlayMinutes = 0; + pkTab->players[j].byST = 0; + pkTab->players[j].byHT = 0; + pkTab->players[j].byDX = 0; + pkTab->players[j].byIQ = 0; + pkTab->players[j].wMainPart = 0; + pkTab->players[j].wHairPart = 0; + pkTab->players[j].x = 0; + pkTab->players[j].y = 0; + pkTab->players[j].skill_group = 0; + pkTab->players[j].bChangeName = 0; str_to_number(pkTab->players[j].byJob, row[col++]); str_to_number(pkTab->players[j].byLevel, row[col++]); @@ -331,7 +331,7 @@ void CreateAccountPlayerDataFromRes(MYSQL_RES * pRes, TAccountTable * pkTab) } SPDLOG_DEBUG("{} {} {} hair {}", - pkTab->players[j].szName, pkTab->players[j].x, pkTab->players[j].y, pkTab->players[j].wHairPart); + pkTab->players[j].szName, pkTab->players[j].x, pkTab->players[j].y, pkTab->players[j].wHairPart); break; } } @@ -346,10 +346,10 @@ void CreateAccountPlayerDataFromRes(MYSQL_RES * pRes, TAccountTable * pkTab) } } -void CClientManager::RESULT_LOGIN(CPeer * peer, SQLMsg * msg) +void CClientManager::RESULT_LOGIN(CPeer *peer, SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - ClientHandleInfo * info = (ClientHandleInfo *) qi->pvData; + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + ClientHandleInfo *info = (ClientHandleInfo *)qi->pvData; if (info->account_index == 0) { @@ -379,14 +379,14 @@ void CClientManager::RESULT_LOGIN(CPeer * peer, SQLMsg * msg) if (g_stLocale == "gb2312") { snprintf(queryStr, sizeof(queryStr), - "SELECT id, name, job, level, alignment, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u", - GetTablePostfix(), info->pAccountTable->id); + "SELECT id, name, job, level, alignment, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u", + GetTablePostfix(), info->pAccountTable->id); } else { snprintf(queryStr, sizeof(queryStr), - "SELECT id, name, job, level, playtime, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u", - GetTablePostfix(), info->pAccountTable->id); + "SELECT id, name, job, level, playtime, st, ht, dx, iq, part_main, part_hair, x, y, skill_group, change_name FROM player%s WHERE account_id=%u", + GetTablePostfix(), info->pAccountTable->id); } CDBManager::instance().ReturnQuery(queryStr, QID_LOGIN, peer->GetHandle(), info); @@ -420,14 +420,13 @@ void CClientManager::RESULT_LOGIN(CPeer * peer, SQLMsg * msg) if (msg->Get()->uiNumRows > 0) CreateAccountPlayerDataFromRes(msg->Get()->pSQLResult, info->pAccountTable); - //PREVENT_COPY_ITEM - CLoginData * p = GetLoginDataByLogin(info->pAccountTable->login); + // PREVENT_COPY_ITEM + CLoginData *p = GetLoginDataByLogin(info->pAccountTable->login); memcpy(&p->GetAccountRef(), info->pAccountTable, sizeof(TAccountTable)); - //END_PREVENT_COPY_ITEM + // END_PREVENT_COPY_ITEM peer->EncodeHeader(HEADER_DG_LOGIN_SUCCESS, info->dwHandle, sizeof(TAccountTable)); peer->Encode(info->pAccountTable, sizeof(TAccountTable)); - } delete info->pAccountTable; @@ -436,14 +435,14 @@ void CClientManager::RESULT_LOGIN(CPeer * peer, SQLMsg * msg) } } -void CClientManager::QUERY_LOGOUT(CPeer * peer, DWORD dwHandle,const char * data) +void CClientManager::QUERY_LOGOUT(CPeer *peer, DWORD dwHandle, const char *data) { - TLogoutPacket* packet = (TLogoutPacket*)data; + TLogoutPacket *packet = (TLogoutPacket *)data; if (!*packet->login) return; - CLoginData * pLoginData = GetLoginDataByLogin(packet->login); + CLoginData *pLoginData = GetLoginDataByLogin(packet->login); if (pLoginData == NULL) return; @@ -457,31 +456,31 @@ void CClientManager::QUERY_LOGOUT(CPeer * peer, DWORD dwHandle,const char * data SPDLOG_TRACE("LOGOUT {} {}", packet->login, pLoginData->GetAccountRef().players[n].dwID); continue; } - + pid[n] = pLoginData->GetAccountRef().players[n].dwID; - SPDLOG_TRACE("LOGOUT InsertLogoutPlayer {} {}", packet->login, pid[n]); + SPDLOG_TRACE("LOGOUT InsertLogoutPlayer {} {}", packet->login, pid[n]); InsertLogoutPlayer(pid[n]); } - + if (DeleteLogonAccount(packet->login, peer->GetHandle())) { - SPDLOG_TRACE("LOGOUT {} ", packet->login); + SPDLOG_TRACE("LOGOUT {} ", packet->login); } } -void CClientManager::QUERY_CHANGE_NAME(CPeer * peer, DWORD dwHandle, TPacketGDChangeName * p) +void CClientManager::QUERY_CHANGE_NAME(CPeer *peer, DWORD dwHandle, TPacketGDChangeName *p) { char queryStr[QUERY_MAX_LEN]; if (g_stLocale == "sjis") snprintf(queryStr, sizeof(queryStr), - "SELECT COUNT(*) as count FROM player%s WHERE name='%s' collate sjis_japanese_ci AND id <> %u", - GetTablePostfix(), p->name, p->pid); + "SELECT COUNT(*) as count FROM player%s WHERE name='%s' collate sjis_japanese_ci AND id <> %u", + GetTablePostfix(), p->name, p->pid); else snprintf(queryStr, sizeof(queryStr), - "SELECT COUNT(*) as count FROM player%s WHERE name='%s' AND id <> %u", GetTablePostfix(), p->name, p->pid); + "SELECT COUNT(*) as count FROM player%s WHERE name='%s' AND id <> %u", GetTablePostfix(), p->name, p->pid); std::unique_ptr pMsg(CDBManager::instance().DirectQuery(queryStr, SQL_PLAYER)); @@ -500,7 +499,7 @@ void CClientManager::QUERY_CHANGE_NAME(CPeer * peer, DWORD dwHandle, TPacketGDCh peer->EncodeHeader(HEADER_DG_PLAYER_CREATE_ALREADY, dwHandle, 0); return; } - } + } else { peer->EncodeHeader(HEADER_DG_PLAYER_CREATE_FAILED, dwHandle, 0); @@ -508,7 +507,7 @@ void CClientManager::QUERY_CHANGE_NAME(CPeer * peer, DWORD dwHandle, TPacketGDCh } snprintf(queryStr, sizeof(queryStr), - "UPDATE player%s SET name='%s',change_name=0 WHERE id=%u", GetTablePostfix(), p->name, p->pid); + "UPDATE player%s SET name='%s',change_name=0 WHERE id=%u", GetTablePostfix(), p->name, p->pid); std::unique_ptr pMsg0(CDBManager::instance().DirectQuery(queryStr, SQL_PLAYER)); @@ -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)); } - diff --git a/src/db/src/ClientManagerParty.cpp b/src/db/src/ClientManagerParty.cpp index 6065d80..7586375 100644 --- a/src/db/src/ClientManagerParty.cpp +++ b/src/db/src/ClientManagerParty.cpp @@ -5,9 +5,9 @@ #include "DBManager.h" #include "QID.h" -void CClientManager::QUERY_PARTY_CREATE(CPeer* peer, TPacketPartyCreate* p) +void CClientManager::QUERY_PARTY_CREATE(CPeer *peer, TPacketPartyCreate *p) { - TPartyMap & pm = m_map_pkChannelParty[peer->GetChannel()]; + TPartyMap &pm = m_map_pkChannelParty[peer->GetChannel()]; if (pm.find(p->dwLeaderPID) == pm.end()) { @@ -21,9 +21,9 @@ void CClientManager::QUERY_PARTY_CREATE(CPeer* peer, TPacketPartyCreate* p) } } -void CClientManager::QUERY_PARTY_DELETE(CPeer* peer, TPacketPartyDelete* p) +void CClientManager::QUERY_PARTY_DELETE(CPeer *peer, TPacketPartyDelete *p) { - TPartyMap& pm = m_map_pkChannelParty[peer->GetChannel()]; + TPartyMap &pm = m_map_pkChannelParty[peer->GetChannel()]; itertype(pm) it = pm.find(p->dwLeaderPID); if (it == pm.end()) @@ -37,9 +37,9 @@ void CClientManager::QUERY_PARTY_DELETE(CPeer* peer, TPacketPartyDelete* p) SPDLOG_DEBUG("PARTY Delete [{}]", p->dwLeaderPID); } -void CClientManager::QUERY_PARTY_ADD(CPeer* peer, TPacketPartyAdd* p) +void CClientManager::QUERY_PARTY_ADD(CPeer *peer, TPacketPartyAdd *p) { - TPartyMap & pm = m_map_pkChannelParty[peer->GetChannel()]; + TPartyMap &pm = m_map_pkChannelParty[peer->GetChannel()]; itertype(pm) it = pm.find(p->dwLeaderPID); if (it == pm.end()) @@ -58,14 +58,14 @@ void CClientManager::QUERY_PARTY_ADD(CPeer* peer, TPacketPartyAdd* p) SPDLOG_ERROR("PARTY Add - Already [{}] in party [{}]", p->dwPID, p->dwLeaderPID); } -void CClientManager::QUERY_PARTY_REMOVE(CPeer* peer, TPacketPartyRemove* p) +void CClientManager::QUERY_PARTY_REMOVE(CPeer *peer, TPacketPartyRemove *p) { - TPartyMap & pm = m_map_pkChannelParty[peer->GetChannel()]; + TPartyMap &pm = m_map_pkChannelParty[peer->GetChannel()]; itertype(pm) it = pm.find(p->dwLeaderPID); if (it == pm.end()) { - SPDLOG_ERROR("PARTY Remove - Non exists [{}] cannot remove [{}]",p->dwLeaderPID, p->dwPID); + SPDLOG_ERROR("PARTY Remove - Non exists [{}] cannot remove [{}]", p->dwLeaderPID, p->dwPID); return; } @@ -81,14 +81,14 @@ void CClientManager::QUERY_PARTY_REMOVE(CPeer* peer, TPacketPartyRemove* p) SPDLOG_ERROR("PARTY Remove - Cannot find [{}] in party [{}]", p->dwPID, p->dwLeaderPID); } -void CClientManager::QUERY_PARTY_STATE_CHANGE(CPeer* peer, TPacketPartyStateChange* p) +void CClientManager::QUERY_PARTY_STATE_CHANGE(CPeer *peer, TPacketPartyStateChange *p) { - TPartyMap & pm = m_map_pkChannelParty[peer->GetChannel()]; + TPartyMap &pm = m_map_pkChannelParty[peer->GetChannel()]; itertype(pm) it = pm.find(p->dwLeaderPID); if (it == pm.end()) { - SPDLOG_ERROR("PARTY StateChange - Non exists [{}] cannot state change [{}]",p->dwLeaderPID, p->dwPID); + SPDLOG_ERROR("PARTY StateChange - Non exists [{}] cannot state change [{}]", p->dwLeaderPID, p->dwPID); return; } @@ -102,21 +102,21 @@ void CClientManager::QUERY_PARTY_STATE_CHANGE(CPeer* peer, TPacketPartyStateChan if (p->bFlag) pit->second.bRole = p->bRole; - else + else pit->second.bRole = 0; ForwardPacket(HEADER_DG_PARTY_STATE_CHANGE, p, sizeof(TPacketPartyStateChange), peer->GetChannel(), peer); - SPDLOG_DEBUG("PARTY StateChange [{}] at [{}] from {} {}",p->dwPID, p->dwLeaderPID, p->bRole, p->bFlag); + SPDLOG_DEBUG("PARTY StateChange [{}] at [{}] from {} {}", p->dwPID, p->dwLeaderPID, p->bRole, p->bFlag); } -void CClientManager::QUERY_PARTY_SET_MEMBER_LEVEL(CPeer* peer, TPacketPartySetMemberLevel* p) +void CClientManager::QUERY_PARTY_SET_MEMBER_LEVEL(CPeer *peer, TPacketPartySetMemberLevel *p) { - TPartyMap & pm = m_map_pkChannelParty[peer->GetChannel()]; + TPartyMap &pm = m_map_pkChannelParty[peer->GetChannel()]; itertype(pm) it = pm.find(p->dwLeaderPID); if (it == pm.end()) { - SPDLOG_ERROR("PARTY SetMemberLevel - Non exists [{}] cannot level change [{}]",p->dwLeaderPID, p->dwPID); + SPDLOG_ERROR("PARTY SetMemberLevel - Non exists [{}] cannot level change [{}]", p->dwLeaderPID, p->dwPID); return; } @@ -131,5 +131,5 @@ void CClientManager::QUERY_PARTY_SET_MEMBER_LEVEL(CPeer* peer, TPacketPartySetMe pit->second.bLevel = p->bLevel; ForwardPacket(HEADER_DG_PARTY_SET_MEMBER_LEVEL, p, sizeof(TPacketPartySetMemberLevel), peer->GetChannel()); - SPDLOG_DEBUG("PARTY SetMemberLevel pid [{}] level {}",p->dwPID, p->bLevel); + SPDLOG_DEBUG("PARTY SetMemberLevel pid [{}] level {}", p->dwPID, p->bLevel); } diff --git a/src/db/src/ClientManagerPlayer.cpp b/src/db/src/ClientManagerPlayer.cpp index ff8a022..5da0eea 100644 --- a/src/db/src/ClientManagerPlayer.cpp +++ b/src/db/src/ClientManagerPlayer.cpp @@ -18,7 +18,7 @@ extern int g_test_server; // // Check all SELECT syntax on item table before change this function!!! // -bool CreateItemTableFromRes(MYSQL_RES * res, std::vector * pVec, DWORD dwPID) +bool CreateItemTableFromRes(MYSQL_RES *res, std::vector *pVec, DWORD dwPID) { if (!res) { @@ -28,7 +28,7 @@ bool CreateItemTableFromRes(MYSQL_RES * res, std::vector * pVec, DW int rows; - if ((rows = mysql_num_rows(res)) <= 0) // 데이터 없음 + if ((rows = mysql_num_rows(res)) <= 0) // 데이터 없음 { pVec->clear(); return true; @@ -39,7 +39,7 @@ bool CreateItemTableFromRes(MYSQL_RES * res, std::vector * pVec, DW for (int i = 0; i < rows; ++i) { MYSQL_ROW row = mysql_fetch_row(res); - TPlayerItem & item = pVec->at(i); + TPlayerItem &item = pVec->at(i); int cur = 0; @@ -61,99 +61,98 @@ bool CreateItemTableFromRes(MYSQL_RES * res, std::vector * pVec, DW str_to_number(item.aAttr[j].sValue, row[cur++]); } - item.owner = dwPID; + item.owner = dwPID; } return true; } -size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * pkTab) +size_t CreatePlayerSaveQuery(char *pszQuery, size_t querySize, TPlayerTable *pkTab) { size_t queryLen; queryLen = snprintf(pszQuery, querySize, - "UPDATE player%s SET " - "job = %d, " - "voice = %d, " - "dir = %d, " - "x = %d, " - "y = %d, " - "z = %d, " - "map_index = %d, " - "exit_x = %d, " - "exit_y = %d, " - "exit_map_index = %d, " - "hp = %d, " - "mp = %d, " - "stamina = %d, " - "random_hp = %d, " - "random_sp = %d, " - "playtime = %d, " - "level = %d, " - "level_step = %d, " - "st = %d, " - "ht = %d, " - "dx = %d, " - "iq = %d, " - "gold = %d, " - "exp = %u, " - "stat_point = %d, " - "skill_point = %d, " - "sub_skill_point = %d, " - "stat_reset_count = %d, " - "ip = '%s', " - "part_main = %d, " - "part_hair = %d, " - "last_play = NOW(), " - "skill_group = %d, " - "alignment = %d, " - "horse_level = %d, " - "horse_riding = %d, " - "horse_hp = %d, " - "horse_hp_droptime = %u, " - "horse_stamina = %d, " - "horse_skill_point = %d, " - , - GetTablePostfix(), - pkTab->job, - pkTab->voice, - pkTab->dir, - pkTab->x, - pkTab->y, - pkTab->z, - pkTab->lMapIndex, - pkTab->lExitX, - pkTab->lExitY, - pkTab->lExitMapIndex, - pkTab->hp, - pkTab->sp, - pkTab->stamina, - pkTab->sRandomHP, - pkTab->sRandomSP, - pkTab->playtime, - pkTab->level, - pkTab->level_step, - pkTab->st, - pkTab->ht, - pkTab->dx, - pkTab->iq, - pkTab->gold, - pkTab->exp, - pkTab->stat_point, - pkTab->skill_point, - pkTab->sub_skill_point, - pkTab->stat_reset_count, - pkTab->ip, - pkTab->parts[PART_MAIN], - pkTab->parts[PART_HAIR], - pkTab->skill_group, - pkTab->lAlignment, - pkTab->horse.bLevel, - pkTab->horse.bRiding, - pkTab->horse.sHealth, - pkTab->horse.dwHorseHealthDropTime, - pkTab->horse.sStamina, - pkTab->horse_skill_point); + "UPDATE player%s SET " + "job = %d, " + "voice = %d, " + "dir = %d, " + "x = %d, " + "y = %d, " + "z = %d, " + "map_index = %d, " + "exit_x = %d, " + "exit_y = %d, " + "exit_map_index = %d, " + "hp = %d, " + "mp = %d, " + "stamina = %d, " + "random_hp = %d, " + "random_sp = %d, " + "playtime = %d, " + "level = %d, " + "level_step = %d, " + "st = %d, " + "ht = %d, " + "dx = %d, " + "iq = %d, " + "gold = %d, " + "exp = %u, " + "stat_point = %d, " + "skill_point = %d, " + "sub_skill_point = %d, " + "stat_reset_count = %d, " + "ip = '%s', " + "part_main = %d, " + "part_hair = %d, " + "last_play = NOW(), " + "skill_group = %d, " + "alignment = %d, " + "horse_level = %d, " + "horse_riding = %d, " + "horse_hp = %d, " + "horse_hp_droptime = %u, " + "horse_stamina = %d, " + "horse_skill_point = %d, ", + GetTablePostfix(), + pkTab->job, + pkTab->voice, + pkTab->dir, + pkTab->x, + pkTab->y, + pkTab->z, + pkTab->lMapIndex, + pkTab->lExitX, + pkTab->lExitY, + pkTab->lExitMapIndex, + pkTab->hp, + pkTab->sp, + pkTab->stamina, + pkTab->sRandomHP, + pkTab->sRandomSP, + pkTab->playtime, + pkTab->level, + pkTab->level_step, + pkTab->st, + pkTab->ht, + pkTab->dx, + pkTab->iq, + pkTab->gold, + pkTab->exp, + pkTab->stat_point, + pkTab->skill_point, + pkTab->sub_skill_point, + pkTab->stat_reset_count, + pkTab->ip, + pkTab->parts[PART_MAIN], + pkTab->parts[PART_HAIR], + pkTab->skill_group, + pkTab->lAlignment, + pkTab->horse.bLevel, + pkTab->horse.bRiding, + pkTab->horse.sHealth, + pkTab->horse.dwHorseHealthDropTime, + pkTab->horse.sStamina, + pkTab->horse_skill_point); // Binary 로 바꾸기 위한 임시 공간 char text[8192 + 1]; @@ -168,21 +167,21 @@ size_t CreatePlayerSaveQuery(char * pszQuery, size_t querySize, TPlayerTable * p return queryLen; } -CPlayerTableCache * CClientManager::GetPlayerCache(DWORD id) +CPlayerTableCache *CClientManager::GetPlayerCache(DWORD id) { TPlayerTableCacheMap::iterator it = m_map_playerCache.find(id); if (it == m_map_playerCache.end()) return NULL; - TPlayerTable* pTable = it->second->Get(false); + TPlayerTable *pTable = it->second->Get(false); pTable->logoff_interval = GetCurrentTime() - it->second->GetLastUpdateTime(); return it->second; } -void CClientManager::PutPlayerCache(TPlayerTable * pNew) +void CClientManager::PutPlayerCache(TPlayerTable *pNew) { - CPlayerTableCache * c; + CPlayerTableCache *c; c = GetPlayerCache(pNew->id); @@ -198,15 +197,15 @@ void CClientManager::PutPlayerCache(TPlayerTable * pNew) /* * PLAYER LOAD */ -void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoadPacket * packet) +void CClientManager::QUERY_PLAYER_LOAD(CPeer *peer, DWORD dwHandle, TPlayerLoadPacket *packet) { - CPlayerTableCache * c; - TPlayerTable * pTab; - + CPlayerTableCache *c; + TPlayerTable *pTab; + // // 한 계정에 속한 모든 캐릭터들 캐쉬처리 // - CLoginData * pLoginData = GetLoginDataByAID(packet->account_id); + CLoginData *pLoginData = GetLoginDataByAID(packet->account_id); if (pLoginData) { @@ -216,21 +215,21 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad } //---------------------------------------------------------------- - // 1. 유저정보가 DBCache 에 존재 : DBCache에서 - // 2. 유저정보가 DBCache 에 없음 : DB에서 + // 1. 유저정보가 DBCache 에 존재 : DBCache에서 + // 2. 유저정보가 DBCache 에 없음 : DB에서 // --------------------------------------------------------------- - + //---------------------------------- - // 1. 유저정보가 DBCache 에 존재 : DBCache에서 + // 1. 유저정보가 DBCache 에 존재 : DBCache에서 //---------------------------------- if ((c = GetPlayerCache(packet->player_id))) { - CLoginData * pkLD = GetLoginDataByAID(packet->account_id); + CLoginData *pkLD = GetLoginDataByAID(packet->account_id); if (!pkLD || pkLD->IsPlay()) { - SPDLOG_DEBUG("PLAYER_LOAD_ERROR: LoginData {} IsPlay {}", (void*) pkLD, pkLD ? pkLD->IsPlay() : 0); - peer->EncodeHeader(HEADER_DG_PLAYER_LOAD_FAILED, dwHandle, 0); + SPDLOG_DEBUG("PLAYER_LOAD_ERROR: LoginData {} IsPlay {}", (void *)pkLD, pkLD ? pkLD->IsPlay() : 0); + peer->EncodeHeader(HEADER_DG_PLAYER_LOAD_FAILED, dwHandle, 0); return; } @@ -247,23 +246,25 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad TPacketNeedLoginLogInfo logInfo; logInfo.dwPlayerID = packet->player_id; - pkLD->SetLastPlayerID( packet->player_id ); + pkLD->SetLastPlayerID(packet->player_id); - peer->EncodeHeader( HEADER_DG_NEED_LOGIN_LOG, dwHandle, sizeof(TPacketNeedLoginLogInfo) ); - peer->Encode( &logInfo, sizeof(TPacketNeedLoginLogInfo) ); + peer->EncodeHeader(HEADER_DG_NEED_LOGIN_LOG, dwHandle, sizeof(TPacketNeedLoginLogInfo)); + peer->Encode(&logInfo, sizeof(TPacketNeedLoginLogInfo)); } - char szQuery[1024] = { 0, }; + char szQuery[1024] = { + 0, + }; - TItemCacheSet * pSet = GetItemCacheSet(pTab->id); + TItemCacheSet *pSet = GetItemCacheSet(pTab->id); SPDLOG_DEBUG("[PLAYER_LOAD] ID {} pid {} gold {} ", pTab->name, pTab->id, pTab->gold); //-------------------------------------------- - // 아이템 & AFFECT & QUEST 로딩 : + // 아이템 & AFFECT & QUEST 로딩 : //-------------------------------------------- // 1) 아이템이 DBCache 에 존재 : DBCache 에서 가져옴 - // 2) 아이템이 DBCache 에 없음 : DB 에서 가져옴 + // 2) 아이템이 DBCache 에 없음 : DB 에서 가져옴 ///////////////////////////////////////////// // 1) 아이템이 DBCache 에 존재 : DBCache 에서 가져옴 @@ -278,8 +279,8 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad while (it != pSet->end()) { - CItemCache * c = *it++; - TPlayerItem * p = c->Get(); + CItemCache *c = *it++; + TPlayerItem *p = c->Get(); if (p->vnum) // vnum이 없으면 삭제된 아이템이다. memcpy(&s_items[dwCount++], p, sizeof(TPlayerItem)); @@ -295,53 +296,53 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad // Quest snprintf(szQuery, sizeof(szQuery), - "SELECT dwPID,szName,szState,lValue FROM quest%s WHERE dwPID=%d AND lValue<>0", - GetTablePostfix(), pTab->id); - - CDBManager::instance().ReturnQuery(szQuery, QID_QUEST, peer->GetHandle(), new ClientHandleInfo(dwHandle,0,packet->account_id)); + "SELECT dwPID,szName,szState,lValue FROM quest%s WHERE dwPID=%d AND lValue<>0", + GetTablePostfix(), pTab->id); + + CDBManager::instance().ReturnQuery(szQuery, QID_QUEST, peer->GetHandle(), new ClientHandleInfo(dwHandle, 0, packet->account_id)); // Affect snprintf(szQuery, sizeof(szQuery), - "SELECT dwPID,bType,bApplyOn,lApplyValue,dwFlag,lDuration,lSPCost FROM affect%s WHERE dwPID=%d", - GetTablePostfix(), pTab->id); + "SELECT dwPID,bType,bApplyOn,lApplyValue,dwFlag,lDuration,lSPCost FROM affect%s WHERE dwPID=%d", + GetTablePostfix(), pTab->id); CDBManager::instance().ReturnQuery(szQuery, QID_AFFECT, peer->GetHandle(), new ClientHandleInfo(dwHandle)); } ///////////////////////////////////////////// - // 2) 아이템이 DBCache 에 없음 : DB 에서 가져옴 + // 2) 아이템이 DBCache 에 없음 : DB 에서 가져옴 ///////////////////////////////////////////// else { - 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 < %d or window = %d)", - GetTablePostfix(), pTab->id, SAFEBOX, DRAGON_SOUL_INVENTORY); + 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 < %d or window = %d)", + GetTablePostfix(), pTab->id, SAFEBOX, DRAGON_SOUL_INVENTORY); CDBManager::instance().ReturnQuery(szQuery, - QID_ITEM, - peer->GetHandle(), - new ClientHandleInfo(dwHandle, pTab->id)); - snprintf(szQuery, sizeof(szQuery), - "SELECT dwPID, szName, szState, lValue FROM quest%s WHERE dwPID=%d", - GetTablePostfix(), pTab->id); + QID_ITEM, + peer->GetHandle(), + new ClientHandleInfo(dwHandle, pTab->id)); + snprintf(szQuery, sizeof(szQuery), + "SELECT dwPID, szName, szState, lValue FROM quest%s WHERE dwPID=%d", + GetTablePostfix(), pTab->id); CDBManager::instance().ReturnQuery(szQuery, - QID_QUEST, - peer->GetHandle(), - new ClientHandleInfo(dwHandle, pTab->id)); - snprintf(szQuery, sizeof(szQuery), - "SELECT dwPID, bType, bApplyOn, lApplyValue, dwFlag, lDuration, lSPCost FROM affect%s WHERE dwPID=%d", - GetTablePostfix(), pTab->id); + QID_QUEST, + peer->GetHandle(), + new ClientHandleInfo(dwHandle, pTab->id)); + snprintf(szQuery, sizeof(szQuery), + "SELECT dwPID, bType, bApplyOn, lApplyValue, dwFlag, lDuration, lSPCost FROM affect%s WHERE dwPID=%d", + GetTablePostfix(), pTab->id); CDBManager::instance().ReturnQuery(szQuery, - QID_AFFECT, - peer->GetHandle(), - new ClientHandleInfo(dwHandle, pTab->id)); + QID_AFFECT, + peer->GetHandle(), + new ClientHandleInfo(dwHandle, pTab->id)); } - //ljw - //return; + // ljw + // return; } //---------------------------------- - // 2. 유저정보가 DBCache 에 없음 : DB에서 + // 2. 유저정보가 DBCache 에 없음 : DB에서 //---------------------------------- else { @@ -350,99 +351,97 @@ void CClientManager::QUERY_PLAYER_LOAD(CPeer * peer, DWORD dwHandle, TPlayerLoad char queryStr[QUERY_MAX_LEN]; //-------------------------------------------------------------- - // 캐릭터 정보 얻어오기 : 무조건 DB에서 + // 캐릭터 정보 얻어오기 : 무조건 DB에서 //-------------------------------------------------------------- snprintf(queryStr, sizeof(queryStr), - "SELECT " - "id,name,job,voice,dir,x,y,z,map_index,exit_x,exit_y,exit_map_index,hp,mp,stamina,random_hp,random_sp,playtime," - "gold,level,level_step,st,ht,dx,iq,exp," - "stat_point,skill_point,sub_skill_point,stat_reset_count,part_base,part_hair," - "skill_level,quickslot,skill_group,alignment,horse_level,horse_riding,horse_hp,horse_hp_droptime,horse_stamina," - "UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(last_play),horse_skill_point FROM player%s WHERE id=%d", - GetTablePostfix(), packet->player_id); + "SELECT " + "id,name,job,voice,dir,x,y,z,map_index,exit_x,exit_y,exit_map_index,hp,mp,stamina,random_hp,random_sp,playtime," + "gold,level,level_step,st,ht,dx,iq,exp," + "stat_point,skill_point,sub_skill_point,stat_reset_count,part_base,part_hair," + "skill_level,quickslot,skill_group,alignment,horse_level,horse_riding,horse_hp,horse_hp_droptime,horse_stamina," + "UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(last_play),horse_skill_point FROM player%s WHERE id=%d", + GetTablePostfix(), packet->player_id); - ClientHandleInfo * pkInfo = new ClientHandleInfo(dwHandle, packet->player_id); + ClientHandleInfo *pkInfo = new ClientHandleInfo(dwHandle, packet->player_id); pkInfo->account_id = packet->account_id; CDBManager::instance().ReturnQuery(queryStr, QID_PLAYER, peer->GetHandle(), pkInfo); //-------------------------------------------------------------- - // 아이템 가져오기 + // 아이템 가져오기 //-------------------------------------------------------------- snprintf(queryStr, sizeof(queryStr), - "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 < %d or window = %d)", - GetTablePostfix(), packet->player_id, SAFEBOX, DRAGON_SOUL_INVENTORY); + "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 < %d or window = %d)", + GetTablePostfix(), packet->player_id, SAFEBOX, DRAGON_SOUL_INVENTORY); CDBManager::instance().ReturnQuery(queryStr, QID_ITEM, peer->GetHandle(), new ClientHandleInfo(dwHandle, packet->player_id)); //-------------------------------------------------------------- - // QUEST 가져오기 + // QUEST 가져오기 //-------------------------------------------------------------- snprintf(queryStr, sizeof(queryStr), - "SELECT dwPID,szName,szState,lValue FROM quest%s WHERE dwPID=%d", - GetTablePostfix(), packet->player_id); - CDBManager::instance().ReturnQuery(queryStr, QID_QUEST, peer->GetHandle(), new ClientHandleInfo(dwHandle, packet->player_id,packet->account_id)); - //독일 선물 기능에서 item_award테이블에서 login 정보를 얻기위해 account id도 넘겨준다 + "SELECT dwPID,szName,szState,lValue FROM quest%s WHERE dwPID=%d", + GetTablePostfix(), packet->player_id); + CDBManager::instance().ReturnQuery(queryStr, QID_QUEST, peer->GetHandle(), new ClientHandleInfo(dwHandle, packet->player_id, packet->account_id)); + // 독일 선물 기능에서 item_award테이블에서 login 정보를 얻기위해 account id도 넘겨준다 //-------------------------------------------------------------- - // AFFECT 가져오기 + // AFFECT 가져오기 //-------------------------------------------------------------- snprintf(queryStr, sizeof(queryStr), - "SELECT dwPID,bType,bApplyOn,lApplyValue,dwFlag,lDuration,lSPCost FROM affect%s WHERE dwPID=%d", - GetTablePostfix(), packet->player_id); + "SELECT dwPID,bType,bApplyOn,lApplyValue,dwFlag,lDuration,lSPCost FROM affect%s WHERE dwPID=%d", + 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) +void CClientManager::ItemAward(CPeer *peer, char *login) { char login_t[LOGIN_MAX_LEN + 1] = ""; - strlcpy(login_t,login,LOGIN_MAX_LEN + 1); - std::set * pSet = ItemAwardManager::instance().GetByLogin(login_t); - if(pSet == NULL) + strlcpy(login_t, login, LOGIN_MAX_LEN + 1); + std::set *pSet = ItemAwardManager::instance().GetByLogin(login_t); + if (pSet == NULL) return; - typeof(pSet->begin()) it = pSet->begin(); //taken_time이 NULL인것들 읽어옴 - while(it != pSet->end() ) - { - TItemAward * pItemAward = *(it++); - char* whyStr = pItemAward->szWhy; //why 콜룸 읽기 - char cmdStr[100] = ""; //why콜룸에서 읽은 값을 임시 문자열에 복사해둠 - strcpy(cmdStr,whyStr); //명령어 얻는 과정에서 토큰쓰면 원본도 토큰화 되기 때문 + typeof(pSet->begin()) it = pSet->begin(); // taken_time이 NULL인것들 읽어옴 + while (it != pSet->end()) + { + TItemAward *pItemAward = *(it++); + char *whyStr = pItemAward->szWhy; // why 콜룸 읽기 + char cmdStr[100] = ""; // why콜룸에서 읽은 값을 임시 문자열에 복사해둠 + strcpy(cmdStr, whyStr); // 명령어 얻는 과정에서 토큰쓰면 원본도 토큰화 되기 때문 char command[20] = ""; - strcpy(command,GetCommand(cmdStr).c_str()); // command 얻기 - if( !(strcmp(command,"GIFT") )) // command 가 GIFT이면 + strcpy(command, GetCommand(cmdStr).c_str()); // command 얻기 + if (!(strcmp(command, "GIFT"))) // command 가 GIFT이면 { TPacketItemAwardInfromer giftData; - strcpy(giftData.login, pItemAward->szLogin); //로그인 아이디 복사 - strcpy(giftData.command, command); //명령어 복사 - giftData.vnum = pItemAward->dwVnum; //아이템 vnum도 복사 - ForwardPacket(HEADER_DG_ITEMAWARD_INFORMER,&giftData,sizeof(TPacketItemAwardInfromer)); + strcpy(giftData.login, pItemAward->szLogin); // 로그인 아이디 복사 + strcpy(giftData.command, command); // 명령어 복사 + giftData.vnum = pItemAward->dwVnum; // 아이템 vnum도 복사 + ForwardPacket(HEADER_DG_ITEMAWARD_INFORMER, &giftData, sizeof(TPacketItemAwardInfromer)); } } } -std::string CClientManager::GetCommand(char* str) +std::string CClientManager::GetCommand(char *str) { char command[20] = ""; - char* tok; + char *tok; - if( str[0] == '[' ) + if (str[0] == '[') { - tok = strtok(str,"]"); - strcat(command,&tok[1]); + tok = strtok(str, "]"); + strcat(command, &tok[1]); } return command; } -bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab) +bool CreatePlayerTableFromRes(MYSQL_RES *res, TPlayerTable *pkTab) { - if (mysql_num_rows(res) == 0) // 데이터 없음 + if (mysql_num_rows(res) == 0) // 데이터 없음 return false; memset(pkTab, 0, sizeof(TPlayerTable)); MYSQL_ROW row = mysql_fetch_row(res); - int col = 0; + int col = 0; // "id,name,job,voice,dir,x,y,z,map_index,exit_x,exit_y,exit_map_index,hp,mp,stamina,random_hp,random_sp,playtime," // "gold,level,level_step,st,ht,dx,iq,exp," @@ -459,7 +458,7 @@ bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab) str_to_number(pkTab->lMapIndex, row[col++]); str_to_number(pkTab->lExitX, row[col++]); str_to_number(pkTab->lExitY, row[col++]); - str_to_number(pkTab->lExitMapIndex, row[col++]); + str_to_number(pkTab->lExitMapIndex, row[col++]); str_to_number(pkTab->hp, row[col++]); str_to_number(pkTab->sp, row[col++]); str_to_number(pkTab->stamina, row[col++]); @@ -514,12 +513,12 @@ bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab) { int max_point = pkTab->level - 9; - int skill_point = - std::min(20, pkTab->skills[121].bLevel) + // SKILL_LEADERSHIP 통솔력 - std::min(20, pkTab->skills[124].bLevel) + // SKILL_MINING 채광 - std::min(10, pkTab->skills[131].bLevel) + // SKILL_HORSE_SUMMON 말소환 - std::min(20, pkTab->skills[141].bLevel) + // SKILL_ADD_HP HP보강 - std::min(20, pkTab->skills[142].bLevel); // SKILL_RESIST_PENETRATE 관통저항 + int skill_point = + std::min(20, pkTab->skills[121].bLevel) + // SKILL_LEADERSHIP 통솔력 + std::min(20, pkTab->skills[124].bLevel) + // SKILL_MINING 채광 + std::min(10, pkTab->skills[131].bLevel) + // SKILL_HORSE_SUMMON 말소환 + std::min(20, pkTab->skills[141].bLevel) + // SKILL_ADD_HP HP보강 + std::min(20, pkTab->skills[142].bLevel); // SKILL_RESIST_PENETRATE 관통저항 pkTab->sub_skill_point = max_point - skill_point; } @@ -530,12 +529,12 @@ bool CreatePlayerTableFromRes(MYSQL_RES * res, TPlayerTable * pkTab) return true; } -void CClientManager::RESULT_COMPOSITE_PLAYER(CPeer * peer, SQLMsg * pMsg, DWORD dwQID) +void CClientManager::RESULT_COMPOSITE_PLAYER(CPeer *peer, SQLMsg *pMsg, DWORD dwQID) { - CQueryInfo * qi = (CQueryInfo *) pMsg->pvUserData; - std::unique_ptr info((ClientHandleInfo *) qi->pvData); - - MYSQL_RES * pSQLResult = pMsg->Get()->pSQLResult; + CQueryInfo *qi = (CQueryInfo *)pMsg->pvUserData; + std::unique_ptr info((ClientHandleInfo *)qi->pvData); + + MYSQL_RES *pSQLResult = pMsg->Get()->pSQLResult; if (!pSQLResult) { SPDLOG_ERROR("null MYSQL_RES QID {}", dwQID); @@ -544,93 +543,92 @@ void CClientManager::RESULT_COMPOSITE_PLAYER(CPeer * peer, SQLMsg * pMsg, DWORD switch (dwQID) { - case QID_PLAYER: - SPDLOG_DEBUG("QID_PLAYER {} {}", info->dwHandle, info->player_id); - RESULT_PLAYER_LOAD(peer, pSQLResult, info.get()); + case QID_PLAYER: + SPDLOG_DEBUG("QID_PLAYER {} {}", info->dwHandle, info->player_id); + RESULT_PLAYER_LOAD(peer, pSQLResult, info.get()); + break; + + case QID_ITEM: + SPDLOG_DEBUG("QID_ITEM {}", info->dwHandle); + RESULT_ITEM_LOAD(peer, pSQLResult, info->dwHandle, info->player_id); + break; + + case QID_QUEST: + { + SPDLOG_DEBUG("QID_QUEST {}", info->dwHandle); + RESULT_QUEST_LOAD(peer, pSQLResult, info->dwHandle, info->player_id); + // aid얻기 + ClientHandleInfo *temp1 = info.get(); + if (temp1 == NULL) break; - case QID_ITEM: - SPDLOG_DEBUG("QID_ITEM {}", info->dwHandle); - RESULT_ITEM_LOAD(peer, pSQLResult, info->dwHandle, info->player_id); + CLoginData *pLoginData1 = GetLoginDataByAID(temp1->account_id); // + // 독일 선물 기능 + if (pLoginData1->GetAccountRef().login == NULL) break; - - case QID_QUEST: - { - SPDLOG_DEBUG("QID_QUEST {}", info->dwHandle); - RESULT_QUEST_LOAD(peer, pSQLResult, info->dwHandle, info->player_id); - //aid얻기 - ClientHandleInfo* temp1 = info.get(); - if (temp1 == NULL) - break; - - CLoginData* pLoginData1 = GetLoginDataByAID(temp1->account_id); // - //독일 선물 기능 - if( pLoginData1->GetAccountRef().login == NULL) - break; - if( pLoginData1 == NULL ) - break; - SPDLOG_DEBUG("info of pLoginData1 before call ItemAwardfunction {}", (void*) pLoginData1); - ItemAward(peer,pLoginData1->GetAccountRef().login); - } + if (pLoginData1 == NULL) break; - - case QID_AFFECT: - SPDLOG_DEBUG("QID_AFFECT {}", info->dwHandle); - RESULT_AFFECT_LOAD(peer, pSQLResult, info->dwHandle); - break; - /* - case QID_PLAYER_ITEM_QUEST_AFFECT: - SPDLOG_DEBUG("QID_PLAYER_ITEM_QUEST_AFFECT {}", info->dwHandle); - RESULT_PLAYER_LOAD(peer, pSQLResult, info->dwHandle); - - if (!pMsg->Next()) - { - SPDLOG_ERROR("RESULT_COMPOSITE_PLAYER: QID_PLAYER_ITEM_QUEST_AFFECT: ITEM FAILED"); - return; - } - - case QID_ITEM_QUEST_AFFECT: - SPDLOG_DEBUG("QID_ITEM_QUEST_AFFECT {}", info->dwHandle); - RESULT_ITEM_LOAD(peer, pSQLResult, info->dwHandle, info->player_id); - - if (!pMsg->Next()) - { - SPDLOG_ERROR("RESULT_COMPOSITE_PLAYER: QID_PLAYER_ITEM_QUEST_AFFECT: QUEST FAILED"); - return; - } - - case QID_QUEST_AFFECT: - SPDLOG_DEBUG("QID_QUEST_AFFECT {}", info->dwHandle); - RESULT_QUEST_LOAD(peer, pSQLResult, info->dwHandle); - - if (!pMsg->Next()) - SPDLOG_ERROR("RESULT_COMPOSITE_PLAYER: QID_PLAYER_ITEM_QUEST_AFFECT: AFFECT FAILED"); - else - RESULT_AFFECT_LOAD(peer, pSQLResult, info->dwHandle); - - break; - */ + SPDLOG_DEBUG("info of pLoginData1 before call ItemAwardfunction {}", (void *)pLoginData1); + ItemAward(peer, pLoginData1->GetAccountRef().login); + } + break; + + case QID_AFFECT: + SPDLOG_DEBUG("QID_AFFECT {}", info->dwHandle); + RESULT_AFFECT_LOAD(peer, pSQLResult, info->dwHandle); + break; + /* + case QID_PLAYER_ITEM_QUEST_AFFECT: + SPDLOG_DEBUG("QID_PLAYER_ITEM_QUEST_AFFECT {}", info->dwHandle); + RESULT_PLAYER_LOAD(peer, pSQLResult, info->dwHandle); + + if (!pMsg->Next()) + { + SPDLOG_ERROR("RESULT_COMPOSITE_PLAYER: QID_PLAYER_ITEM_QUEST_AFFECT: ITEM FAILED"); + return; + } + + case QID_ITEM_QUEST_AFFECT: + SPDLOG_DEBUG("QID_ITEM_QUEST_AFFECT {}", info->dwHandle); + RESULT_ITEM_LOAD(peer, pSQLResult, info->dwHandle, info->player_id); + + if (!pMsg->Next()) + { + SPDLOG_ERROR("RESULT_COMPOSITE_PLAYER: QID_PLAYER_ITEM_QUEST_AFFECT: QUEST FAILED"); + return; + } + + case QID_QUEST_AFFECT: + SPDLOG_DEBUG("QID_QUEST_AFFECT {}", info->dwHandle); + RESULT_QUEST_LOAD(peer, pSQLResult, info->dwHandle); + + if (!pMsg->Next()) + SPDLOG_ERROR("RESULT_COMPOSITE_PLAYER: QID_PLAYER_ITEM_QUEST_AFFECT: AFFECT FAILED"); + else + RESULT_AFFECT_LOAD(peer, pSQLResult, info->dwHandle); + + break; + */ } - } -void CClientManager::RESULT_PLAYER_LOAD(CPeer * peer, MYSQL_RES * pRes, ClientHandleInfo * pkInfo) +void CClientManager::RESULT_PLAYER_LOAD(CPeer *peer, MYSQL_RES *pRes, ClientHandleInfo *pkInfo) { TPlayerTable tab; if (!CreatePlayerTableFromRes(pRes, &tab)) { - peer->EncodeHeader(HEADER_DG_PLAYER_LOAD_FAILED, pkInfo->dwHandle, 0); + peer->EncodeHeader(HEADER_DG_PLAYER_LOAD_FAILED, pkInfo->dwHandle, 0); return; } - CLoginData * pkLD = GetLoginDataByAID(pkInfo->account_id); - + CLoginData *pkLD = GetLoginDataByAID(pkInfo->account_id); + if (!pkLD || pkLD->IsPlay()) { - SPDLOG_DEBUG("PLAYER_LOAD_ERROR: LoginData {} IsPlay {}", (void*) pkLD, pkLD ? pkLD->IsPlay() : 0); - peer->EncodeHeader(HEADER_DG_PLAYER_LOAD_FAILED, pkInfo->dwHandle, 0); + SPDLOG_DEBUG("PLAYER_LOAD_ERROR: LoginData {} IsPlay {}", (void *)pkLD, pkLD ? pkLD->IsPlay() : 0); + peer->EncodeHeader(HEADER_DG_PLAYER_LOAD_FAILED, pkInfo->dwHandle, 0); return; } @@ -645,24 +643,24 @@ void CClientManager::RESULT_PLAYER_LOAD(CPeer * peer, MYSQL_RES * pRes, ClientHa TPacketNeedLoginLogInfo logInfo; logInfo.dwPlayerID = tab.id; - pkLD->SetLastPlayerID( tab.id ); + pkLD->SetLastPlayerID(tab.id); - peer->EncodeHeader( HEADER_DG_NEED_LOGIN_LOG, pkInfo->dwHandle, sizeof(TPacketNeedLoginLogInfo) ); - peer->Encode( &logInfo, sizeof(TPacketNeedLoginLogInfo) ); + peer->EncodeHeader(HEADER_DG_NEED_LOGIN_LOG, pkInfo->dwHandle, sizeof(TPacketNeedLoginLogInfo)); + peer->Encode(&logInfo, sizeof(TPacketNeedLoginLogInfo)); } } -void CClientManager::RESULT_ITEM_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwHandle, DWORD dwPID) +void CClientManager::RESULT_ITEM_LOAD(CPeer *peer, MYSQL_RES *pRes, DWORD dwHandle, DWORD dwPID) { static std::vector s_items; - //DB에서 아이템 정보를 읽어온다. + // DB에서 아이템 정보를 읽어온다. CreateItemTableFromRes(pRes, &s_items, dwPID); DWORD dwCount = s_items.size(); peer->EncodeHeader(HEADER_DG_ITEM_LOAD, dwHandle, sizeof(DWORD) + sizeof(TPlayerItem) * dwCount); peer->EncodeDWORD(dwCount); - //CacheSet을 만든다 + // CacheSet을 만든다 CreateItemCacheSet(dwPID); // ITEM_LOAD_LOG_ATTACH_PID @@ -678,7 +676,7 @@ void CClientManager::RESULT_ITEM_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwHa } } -void CClientManager::RESULT_AFFECT_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwHandle) +void CClientManager::RESULT_AFFECT_LOAD(CPeer *peer, MYSQL_RES *pRes, DWORD dwHandle) { int iNumRows; @@ -694,7 +692,7 @@ void CClientManager::RESULT_AFFECT_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dw for (int i = 0; i < iNumRows; ++i) { - TPacketAffectElement & r = s_elements[i]; + TPacketAffectElement &r = s_elements[i]; row = mysql_fetch_row(pRes); if (dwPID == 0) @@ -718,13 +716,13 @@ void CClientManager::RESULT_AFFECT_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dw peer->Encode(&s_elements[0], sizeof(TPacketAffectElement) * dwCount); } -void CClientManager::RESULT_QUEST_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwHandle, DWORD pid) +void CClientManager::RESULT_QUEST_LOAD(CPeer *peer, MYSQL_RES *pRes, DWORD dwHandle, DWORD pid) { int iNumRows; if ((iNumRows = mysql_num_rows(pRes)) == 0) { - DWORD dwCount = 0; + DWORD dwCount = 0; peer->EncodeHeader(HEADER_DG_QUEST_LOAD, dwHandle, sizeof(DWORD)); peer->Encode(&dwCount, sizeof(DWORD)); return; @@ -737,7 +735,7 @@ void CClientManager::RESULT_QUEST_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwH for (int i = 0; i < iNumRows; ++i) { - TQuestTable & r = s_table[i]; + TQuestTable &r = s_table[i]; row = mysql_fetch_row(pRes); @@ -759,7 +757,7 @@ void CClientManager::RESULT_QUEST_LOAD(CPeer * peer, MYSQL_RES * pRes, DWORD dwH /* * PLAYER SAVE */ -void CClientManager::QUERY_PLAYER_SAVE(CPeer * peer, DWORD dwHandle, TPlayerTable * pkTab) +void CClientManager::QUERY_PLAYER_SAVE(CPeer *peer, DWORD dwHandle, TPlayerTable *pkTab) { SPDLOG_TRACE("PLAYER_SAVE: {}", pkTab->name); @@ -772,11 +770,11 @@ static time_by_id_map_t s_createTimeByAccountID; /* * PLAYER CREATE */ -void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerCreatePacket* packet) +void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerCreatePacket *packet) { - char queryStr[QUERY_MAX_LEN]; - int queryLen; - DWORD player_id; + char queryStr[QUERY_MAX_LEN]; + int queryLen; + DWORD player_id; // 한 계정에 X초 내로 캐릭터 생성을 할 수 없다. auto it = s_createTimeByAccountID.find(packet->account_id); @@ -792,8 +790,8 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC } } - queryLen = snprintf(queryStr, sizeof(queryStr), - "SELECT pid%u FROM player_index%s WHERE id=%d", packet->account_index + 1, GetTablePostfix(), packet->account_id); + queryLen = snprintf(queryStr, sizeof(queryStr), + "SELECT pid%u FROM player_index%s WHERE id=%d", packet->account_index + 1, GetTablePostfix(), packet->account_id); std::unique_ptr pMsg0(CDBManager::instance().DirectQuery(queryStr)); @@ -807,7 +805,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); @@ -823,13 +822,13 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC if (g_stLocale == "sjis") snprintf(queryStr, sizeof(queryStr), - "SELECT COUNT(*) as count FROM player%s WHERE name='%s' collate sjis_japanese_ci", - GetTablePostfix(), packet->player_table.name); + "SELECT COUNT(*) as count FROM player%s WHERE name='%s' collate sjis_japanese_ci", + GetTablePostfix(), packet->player_table.name); else - snprintf(queryStr, sizeof(queryStr), - "SELECT COUNT(*) as count FROM player%s WHERE name='%s'", GetTablePostfix(), packet->player_table.name); + snprintf(queryStr, sizeof(queryStr), + "SELECT COUNT(*) as count FROM player%s WHERE name='%s'", GetTablePostfix(), packet->player_table.name); - std::unique_ptr pMsg1(CDBManager::instance().DirectQuery(queryStr)); + std::unique_ptr pMsg1(CDBManager::instance().DirectQuery(queryStr)); if (pMsg1->Get()->uiNumRows) { @@ -854,28 +853,28 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC return; } - queryLen = snprintf(queryStr, sizeof(queryStr), - "INSERT INTO player%s " - "(id, account_id, name, level, st, ht, dx, iq, " - "job, voice, dir, x, y, z, " - "hp, mp, random_hp, random_sp, stat_point, stamina, part_base, part_main, part_hair, gold, playtime, " - "skill_level, quickslot) " - "VALUES(0, %u, '%s', %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, %d, " - "%d, %d, %d, %d, %d, %d, %d, 0, %d, 0, ", - GetTablePostfix(), - packet->account_id, packet->player_table.name, packet->player_table.level, packet->player_table.st, packet->player_table.ht, packet->player_table.dx, packet->player_table.iq, - packet->player_table.job, packet->player_table.voice, packet->player_table.dir, packet->player_table.x, packet->player_table.y, packet->player_table.z, - packet->player_table.hp, packet->player_table.sp, packet->player_table.sRandomHP, packet->player_table.sRandomSP, packet->player_table.stat_point, packet->player_table.stamina, packet->player_table.part_base, packet->player_table.part_base, packet->player_table.gold); + queryLen = snprintf(queryStr, sizeof(queryStr), + "INSERT INTO player%s " + "(id, account_id, name, level, st, ht, dx, iq, " + "job, voice, dir, x, y, z, " + "hp, mp, random_hp, random_sp, stat_point, stamina, part_base, part_main, part_hair, gold, playtime, " + "skill_level, quickslot) " + "VALUES(0, %u, '%s', %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d, %d, " + "%d, %d, %d, %d, %d, %d, %d, 0, %d, 0, ", + GetTablePostfix(), + packet->account_id, packet->player_table.name, packet->player_table.level, packet->player_table.st, packet->player_table.ht, packet->player_table.dx, packet->player_table.iq, + packet->player_table.job, packet->player_table.voice, packet->player_table.dir, packet->player_table.x, packet->player_table.y, packet->player_table.z, + packet->player_table.hp, packet->player_table.sp, packet->player_table.sRandomHP, packet->player_table.sRandomSP, packet->player_table.stat_point, packet->player_table.stamina, packet->player_table.part_base, packet->player_table.part_base, packet->player_table.gold); SPDLOG_DEBUG("PlayerCreate accountid {} name {} level {} gold {}, st {} ht {} job {}", - packet->account_id, - packet->player_table.name, - packet->player_table.level, - packet->player_table.gold, - packet->player_table.st, - packet->player_table.ht, - packet->player_table.job); + packet->account_id, + packet->player_table.name, + packet->player_table.level, + packet->player_table.gold, + packet->player_table.st, + packet->player_table.ht, + packet->player_table.job); char text[8192 + 1]; @@ -898,8 +897,8 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC player_id = pMsg2->Get()->uiInsertID; - snprintf(queryStr, sizeof(queryStr), "UPDATE player_index%s SET pid%d=%d WHERE id=%d", - GetTablePostfix(), packet->account_index + 1, player_id, packet->account_id); + snprintf(queryStr, sizeof(queryStr), "UPDATE player_index%s SET pid%d=%d WHERE id=%d", + GetTablePostfix(), packet->account_index + 1, player_id, packet->account_id); std::unique_ptr pMsg3(CDBManager::instance().DirectQuery(queryStr)); if (pMsg3->Get()->uiAffectedRows <= 0) @@ -918,18 +917,18 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC pack.bAccountCharacterIndex = packet->account_index; - pack.player.dwID = player_id; + pack.player.dwID = player_id; strlcpy(pack.player.szName, packet->player_table.name, sizeof(pack.player.szName)); - pack.player.byJob = packet->player_table.job; - pack.player.byLevel = 1; - pack.player.dwPlayMinutes = 0; - pack.player.byST = packet->player_table.st; - pack.player.byHT = packet->player_table.ht; - pack.player.byDX = packet->player_table.dx; - pack.player.byIQ = packet->player_table.iq; - pack.player.wMainPart = packet->player_table.part_base; - pack.player.x = packet->player_table.x; - pack.player.y = packet->player_table.y; + pack.player.byJob = packet->player_table.job; + pack.player.byLevel = 1; + pack.player.dwPlayMinutes = 0; + pack.player.byST = packet->player_table.st; + pack.player.byHT = packet->player_table.ht; + pack.player.byDX = packet->player_table.dx; + pack.player.byIQ = packet->player_table.iq; + pack.player.wMainPart = packet->player_table.part_base; + pack.player.x = packet->player_table.x; + pack.player.y = packet->player_table.y; peer->EncodeHeader(HEADER_DG_PLAYER_CREATE_SUCCESS, dwHandle, sizeof(TPacketDGCreateSuccess)); peer->Encode(&pack, sizeof(TPacketDGCreateSuccess)); @@ -942,12 +941,12 @@ void CClientManager::__QUERY_PLAYER_CREATE(CPeer *peer, DWORD dwHandle, TPlayerC /* * PLAYER DELETE */ -void CClientManager::__QUERY_PLAYER_DELETE(CPeer* peer, DWORD dwHandle, TPlayerDeletePacket* packet) +void CClientManager::__QUERY_PLAYER_DELETE(CPeer *peer, DWORD dwHandle, TPlayerDeletePacket *packet) { if (!packet->login[0] || !packet->player_id || packet->account_index >= PLAYER_PER_ACCOUNT) return; - CLoginData * ld = GetLoginDataByLogin(packet->login); + CLoginData *ld = GetLoginDataByLogin(packet->login); if (!ld) { @@ -956,9 +955,9 @@ void CClientManager::__QUERY_PLAYER_DELETE(CPeer* peer, DWORD dwHandle, TPlayerD return; } - TAccountTable & r = ld->GetAccountRef(); + TAccountTable &r = ld->GetAccountRef(); - // block for japan + // block for japan if (g_stLocale != "sjis") { if (!IsChinaEventServer()) @@ -971,10 +970,10 @@ void CClientManager::__QUERY_PLAYER_DELETE(CPeer* peer, DWORD dwHandle, TPlayerD return; } - CPlayerTableCache * pkPlayerCache = GetPlayerCache(packet->player_id); + CPlayerTableCache *pkPlayerCache = GetPlayerCache(packet->player_id); if (pkPlayerCache) { - TPlayerTable * pTab = pkPlayerCache->Get(); + TPlayerTable *pTab = pkPlayerCache->Get(); if (pTab->level >= m_iPlayerDeleteLevelLimit) { @@ -996,10 +995,10 @@ void CClientManager::__QUERY_PLAYER_DELETE(CPeer* peer, DWORD dwHandle, TPlayerD } char szQuery[128]; - snprintf(szQuery, sizeof(szQuery), "SELECT p.id, p.level, p.name FROM player_index%s AS i, player%s AS p WHERE pid%u=%u AND pid%u=p.id", - GetTablePostfix(), GetTablePostfix(), packet->account_index + 1, packet->player_id, packet->account_index + 1); + snprintf(szQuery, sizeof(szQuery), "SELECT p.id, p.level, p.name FROM player_index%s AS i, player%s AS p WHERE pid%u=%u AND pid%u=p.id", + GetTablePostfix(), GetTablePostfix(), packet->account_index + 1, packet->player_id, packet->account_index + 1); - ClientHandleInfo * pi = new ClientHandleInfo(dwHandle, packet->player_id); + ClientHandleInfo *pi = new ClientHandleInfo(dwHandle, packet->player_id); pi->account_index = packet->account_index; SPDLOG_DEBUG("PLAYER_DELETE TRY: {} {} pid{}", packet->login, packet->player_id, packet->account_index + 1); @@ -1009,10 +1008,10 @@ void CClientManager::__QUERY_PLAYER_DELETE(CPeer* peer, DWORD dwHandle, TPlayerD // // @version 05/06/10 Bang2ni - 플레이어 삭제시 가격정보 리스트 삭제 추가. // -void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg) +void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg *msg) { - CQueryInfo * qi = (CQueryInfo *) msg->pvUserData; - ClientHandleInfo * pi = (ClientHandleInfo *) qi->pvData; + CQueryInfo *qi = (CQueryInfo *)msg->pvUserData; + ClientHandleInfo *pi = (ClientHandleInfo *)qi->pvData; if (msg->Get() && msg->Get()->uiNumRows) { @@ -1045,8 +1044,8 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg) char queryStr[QUERY_MAX_LEN]; - snprintf(queryStr, sizeof(queryStr), "INSERT INTO player%s_deleted SELECT * FROM player%s WHERE id=%d", - GetTablePostfix(), GetTablePostfix(), pi->player_id); + snprintf(queryStr, sizeof(queryStr), "INSERT INTO player%s_deleted SELECT * FROM player%s WHERE id=%d", + GetTablePostfix(), GetTablePostfix(), pi->player_id); std::unique_ptr pIns(CDBManager::instance().DirectQuery(queryStr)); if (pIns->Get()->uiAffectedRows == 0 || pIns->Get()->uiAffectedRows == (uint32_t)-1) @@ -1066,7 +1065,7 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg) snprintf(account_index_string, sizeof(account_index_string), "player_id%d", m_iPlayerIDStart + pi->account_index); // 플레이어 테이블을 캐쉬에서 삭제한다. - CPlayerTableCache * pkPlayerCache = GetPlayerCache(pi->player_id); + CPlayerTableCache *pkPlayerCache = GetPlayerCache(pi->player_id); if (pkPlayerCache) { @@ -1075,7 +1074,7 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg) } // 아이템들을 캐쉬에서 삭제한다. - TItemCacheSet * pSet = GetItemCacheSet(pi->player_id); + TItemCacheSet *pSet = GetItemCacheSet(pi->player_id); if (pSet) { @@ -1083,7 +1082,7 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg) while (it != pSet->end()) { - CItemCache * pkItemCache = *it++; + CItemCache *pkItemCache = *it++; DeleteItemCache(pkItemCache->Get()->id); } @@ -1093,11 +1092,11 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg) m_map_pkItemCacheSetPtr.erase(pi->player_id); } - snprintf(queryStr, sizeof(queryStr), "UPDATE player_index%s SET pid%u=0 WHERE pid%u=%d", - GetTablePostfix(), - pi->account_index + 1, - pi->account_index + 1, - pi->player_id); + snprintf(queryStr, sizeof(queryStr), "UPDATE player_index%s SET pid%u=0 WHERE pid%u=%d", + GetTablePostfix(), + pi->account_index + 1, + pi->account_index + 1, + pi->player_id); std::unique_ptr pMsg(CDBManager::instance().DirectQuery(queryStr)); @@ -1144,7 +1143,7 @@ void CClientManager::__RESULT_PLAYER_DELETE(CPeer *peer, SQLMsg* msg) } } -void CClientManager::QUERY_ADD_AFFECT(CPeer * peer, TPacketGDAddAffect * p) +void CClientManager::QUERY_ADD_AFFECT(CPeer *peer, TPacketGDAddAffect *p) { char queryStr[QUERY_MAX_LEN]; /* @@ -1166,27 +1165,27 @@ void CClientManager::QUERY_ADD_AFFECT(CPeer * peer, TPacketGDAddAffect * p) p->elem.lSPCost); */ snprintf(queryStr, sizeof(queryStr), - "REPLACE INTO affect%s (dwPID, bType, bApplyOn, lApplyValue, dwFlag, lDuration, lSPCost) " - "VALUES(%u, %u, %u, %d, %u, %d, %d)", - GetTablePostfix(), - p->dwPID, - p->elem.dwType, - p->elem.bApplyOn, - p->elem.lApplyValue, - p->elem.dwFlag, - p->elem.lDuration, - p->elem.lSPCost); + "REPLACE INTO affect%s (dwPID, bType, bApplyOn, lApplyValue, dwFlag, lDuration, lSPCost) " + "VALUES(%u, %u, %u, %d, %u, %d, %d)", + GetTablePostfix(), + p->dwPID, + p->elem.dwType, + p->elem.bApplyOn, + p->elem.lApplyValue, + p->elem.dwFlag, + p->elem.lDuration, + p->elem.lSPCost); CDBManager::instance().AsyncQuery(queryStr); } -void CClientManager::QUERY_REMOVE_AFFECT(CPeer * peer, TPacketGDRemoveAffect * p) +void CClientManager::QUERY_REMOVE_AFFECT(CPeer *peer, TPacketGDRemoveAffect *p) { char queryStr[QUERY_MAX_LEN]; snprintf(queryStr, sizeof(queryStr), - "DELETE FROM affect%s WHERE dwPID=%u AND bType=%u AND bApplyOn=%u", - GetTablePostfix(), p->dwPID, p->dwType, p->bApplyOn); + "DELETE FROM affect%s WHERE dwPID=%u AND bType=%u AND bApplyOn=%u", + GetTablePostfix(), p->dwPID, p->dwType, p->bApplyOn); CDBManager::instance().AsyncQuery(queryStr); } @@ -1199,18 +1198,18 @@ void CClientManager::InsertLogoutPlayer(DWORD pid) if (it != m_map_logout.end()) { // 존재할경우 시간만 갱신 - SPDLOG_TRACE("LOGOUT: Update player time pid({})", pid); + SPDLOG_TRACE("LOGOUT: Update player time pid({})", pid); it->second->time = time(0); return; } - - TLogoutPlayer * pLogout = new TLogoutPlayer; + + TLogoutPlayer *pLogout = new TLogoutPlayer; pLogout->pid = pid; pLogout->time = time(0); m_map_logout.insert(std::make_pair(pid, pLogout)); - SPDLOG_TRACE("LOGOUT: Insert player pid({})", pid); + SPDLOG_TRACE("LOGOUT: Insert player pid({})", pid); } void CClientManager::DeleteLogoutPlayer(DWORD pid) @@ -1234,7 +1233,7 @@ void CClientManager::UpdateLogoutPlayer() while (it != m_map_logout.end()) { - TLogoutPlayer* pLogout = it->second; + TLogoutPlayer *pLogout = it->second; if (now - g_iLogoutSeconds > pLogout->time) { @@ -1255,11 +1254,10 @@ void CClientManager::FlushPlayerCacheSet(DWORD pid) if (it != m_map_playerCache.end()) { - CPlayerTableCache * c = it->second; + CPlayerTableCache *c = it->second; m_map_playerCache.erase(it); c->Flush(); - delete c; + delete c; } } - diff --git a/src/db/src/Config.cpp b/src/db/src/Config.cpp index 24ae9b3..f6ebb8c 100644 --- a/src/db/src/Config.cpp +++ b/src/db/src/Config.cpp @@ -35,7 +35,7 @@ bool CConfig::GetWord(FILE *fp, char *tar) while ((c = fgetc(fp)) != EOF) { - if (c == 13) + if (c == 13) continue; if (semicolon_mode) @@ -80,7 +80,7 @@ bool CConfig::GetWord(FILE *fp, char *tar) return (i != 0); } -bool CConfig::GetLine(FILE* fp, char*dest) +bool CConfig::GetLine(FILE *fp, char *dest) { int c; int i = 0; @@ -91,15 +91,15 @@ bool CConfig::GetLine(FILE* fp, char*dest) dest[i] = c; ++i; } - return true; + return true; } -bool CConfig::LoadFile(const char* filename) +bool CConfig::LoadFile(const char *filename) { - char szTmp[256]; - char comment[256]; + char szTmp[256]; + char comment[256]; - FILE * fp = fopen(filename, "rb"); + FILE *fp = fopen(filename, "rb"); if (fp == NULL) return false; @@ -116,20 +116,20 @@ bool CConfig::LoadFile(const char* filename) switch (mode) { - case 0: - strlcpy(comment, szTmp, sizeof(comment)); + case 0: + strlcpy(comment, szTmp, sizeof(comment)); + ++mode; + break; + + case 1: + if (*szTmp == '=') ++mode; - break; + break; - case 1: - if (*szTmp == '=') - ++mode; - break; - - case 2: - mode = 0; - m_valueMap.insert(TValueMap::value_type(comment, szTmp)); - break; + case 2: + mode = 0; + m_valueMap.insert(TValueMap::value_type(comment, szTmp)); + break; } // ITEM_ID_RANGE @@ -137,21 +137,19 @@ bool CConfig::LoadFile(const char* filename) { GetLine(fp, szTmp); m_valueMap.insert(TValueMap::value_type(comment, szTmp)); - mode = 0; - + mode = 0; } // ITEM_ID_RANGE_END } - // 파일 닫는 부분. fclose(fp); return true; } -std::string * CConfig::Search(const char* key) +std::string *CConfig::Search(const char *key) { - itertype(m_valueMap) i = m_valueMap.find(key); + itertype(m_valueMap) i = m_valueMap.find(key); if (i == m_valueMap.end()) return NULL; @@ -159,24 +157,24 @@ std::string * CConfig::Search(const char* key) return (&i->second); } -bool CConfig::GetParam(const char*key, int index, DWORD *Param) +bool CConfig::GetParam(const char *key, int index, DWORD *Param) { - std::string * pstStr = Search(key); + std::string *pstStr = Search(key); if (!pstStr) return false; char szParam[5][32]; - sscanf(pstStr->c_str(), "%s %s %s %s %s", szParam[0],szParam[1],szParam[2],szParam[3],szParam[4]); + sscanf(pstStr->c_str(), "%s %s %s %s %s", szParam[0], szParam[1], szParam[2], szParam[3], szParam[4]); str_to_number(*Param, szParam[index]); SPDLOG_DEBUG("GetParam {}", *Param); return true; } -const char * CConfig::Get(const char* key) +const char *CConfig::Get(const char *key) { - std::string * pstStr = Search(key); + std::string *pstStr = Search(key); if (!pstStr) { @@ -187,8 +185,7 @@ const char * CConfig::Get(const char* key) return pstStr->c_str(); } - -bool CConfig::GetValue(const char * key, int* dest) +bool CConfig::GetValue(const char *key, int *dest) { if (!Search(key)) return false; @@ -197,8 +194,8 @@ bool CConfig::GetValue(const char * key, int* dest) return true; } -bool CConfig::GetValue(const char * key, float *dest) -{ +bool CConfig::GetValue(const char *key, float *dest) +{ if (!Search(key)) return false; @@ -206,8 +203,8 @@ bool CConfig::GetValue(const char * key, float *dest) return true; } -bool CConfig::GetValue(const char * key, DWORD *dest) -{ +bool CConfig::GetValue(const char *key, DWORD *dest) +{ if (!Search(key)) return false; @@ -215,17 +212,17 @@ bool CConfig::GetValue(const char * key, DWORD *dest) return true; } -bool CConfig::GetValue(const char * key, BYTE *dest) -{ +bool CConfig::GetValue(const char *key, BYTE *dest) +{ if (!Search(key)) return false; - *dest = *(BYTE *) Get(key); + *dest = *(BYTE *)Get(key); return true; } -bool CConfig::GetValue(const char * key, char *dest, size_t destSize) -{ +bool CConfig::GetValue(const char *key, char *dest, size_t destSize) +{ if (!Search(key)) return false; @@ -237,7 +234,7 @@ bool CConfig::GetValue(const char * key, char *dest, size_t destSize) return true; } -bool CConfig::GetTwoValue(const char* key, DWORD * dest1, DWORD *dest2) +bool CConfig::GetTwoValue(const char *key, DWORD *dest1, DWORD *dest2) { if (!GetParam(key, 0, dest1)) return false; @@ -247,4 +244,3 @@ bool CConfig::GetTwoValue(const char* key, DWORD * dest1, DWORD *dest2) return true; } - diff --git a/src/db/src/Config.h b/src/db/src/Config.h index 4508832..f31d9b3 100644 --- a/src/db/src/Config.h +++ b/src/db/src/Config.h @@ -5,30 +5,30 @@ typedef std::map TValueMap; class CConfig : public singleton { - public: - CConfig(); - ~CConfig(); +public: + CConfig(); + ~CConfig(); - bool LoadFile(const char* filename); - bool GetValue(const char* key, int* dest); - bool GetValue(const char* key, float* dest); - bool GetValue(const char* key, DWORD* dest); - bool GetValue(const char* key, BYTE* dest); - bool GetValue(const char* key, char* dest, size_t destSize); - bool GetWord(FILE* fp, char* dest); - bool GetLine(FILE* fp, char* dest); - bool GetTwoValue(const char* key, DWORD * dest1, DWORD *dest2); - void NextLine(FILE* fp); + bool LoadFile(const char *filename); + bool GetValue(const char *key, int *dest); + bool GetValue(const char *key, float *dest); + bool GetValue(const char *key, DWORD *dest); + bool GetValue(const char *key, BYTE *dest); + bool GetValue(const char *key, char *dest, size_t destSize); + bool GetWord(FILE *fp, char *dest); + bool GetLine(FILE *fp, char *dest); + bool GetTwoValue(const char *key, DWORD *dest1, DWORD *dest2); + void NextLine(FILE *fp); - private: - void Destroy(); - bool GetParam(const char*key,int index, DWORD *Param); +private: + void Destroy(); + bool GetParam(const char *key, int index, DWORD *Param); - const char * Get(const char* key); - std::string * Search(const char* key); + const char *Get(const char *key); + std::string *Search(const char *key); - private: - TValueMap m_valueMap; +private: + TValueMap m_valueMap; }; #endif diff --git a/src/db/src/CsvReader.cpp b/src/db/src/CsvReader.cpp index 59cd7c6..fd69d2e 100644 --- a/src/db/src/CsvReader.cpp +++ b/src/db/src/CsvReader.cpp @@ -4,9 +4,9 @@ #include #ifndef Assert - #include - #define Assert assert - #define LogToFile (void)(0); +#include +#define Assert assert +#define LogToFile (void)(0); #endif namespace @@ -39,7 +39,7 @@ namespace /// \param name 셀 이름 /// \param index 셀 인덱스 //////////////////////////////////////////////////////////////////////////////// -void cCsvAlias::AddAlias(const char* name, size_t index) +void cCsvAlias::AddAlias(const char *name, size_t index) { std::string converted(Lower(name)); @@ -64,7 +64,7 @@ void cCsvAlias::Destroy() /// \param index 숫자 인덱스 /// \return const char* 이름 //////////////////////////////////////////////////////////////////////////////// -const char* cCsvAlias::operator [] (size_t index) const +const char *cCsvAlias::operator[](size_t index) const { INDEX2NAME_MAP::const_iterator itr(m_Index2Name.find(index)); if (itr == m_Index2Name.end()) @@ -82,7 +82,7 @@ const char* cCsvAlias::operator [] (size_t index) const /// \param name 이름 /// \return size_t 숫자 인덱스 //////////////////////////////////////////////////////////////////////////////// -size_t cCsvAlias::operator [] (const char* name) const +size_t cCsvAlias::operator[](const char *name) const { NAME2INDEX_MAP::const_iterator itr(m_Name2Index.find(Lower(name))); if (itr == m_Name2Index.end()) @@ -102,29 +102,33 @@ size_t cCsvAlias::operator [] (const char* name) const /// \param quote 따옴표로 사용할 글자. 기본값은 '"'이다. /// \return bool 무사히 로드했다면 true, 아니라면 false //////////////////////////////////////////////////////////////////////////////// -bool cCsvFile::Load(const char* fileName, const char seperator, const char quote) +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; + cCsvRow *row = NULL; ParseState state = STATE_NORMAL; std::string token = ""; - char buf[2048+1] = {0,}; + char buf[2048 + 1] = { + 0, + }; while (file.good()) { file.getline(buf, 2048); - buf[sizeof(buf)-1] = 0; + buf[sizeof(buf) - 1] = 0; std::string line(Trim(buf)); - if (line.empty() || (state == STATE_NORMAL && line[0] == '#')) continue; - - std::string text = std::string(line) + " "; // 파싱 lookahead 때문에 붙여준다. + if (line.empty() || (state == STATE_NORMAL && line[0] == '#')) + continue; + + std::string text = std::string(line) + " "; // 파싱 lookahead 때문에 붙여준다. size_t cur = 0; while (cur < text.size()) @@ -135,21 +139,21 @@ bool cCsvFile::Load(const char* fileName, const char seperator, const char quote // '"' 문자의 종류는 두 가지이다. // 1. 셀 내부에 특수 문자가 있을 경우 이를 알리는 셀 좌우의 것 // 2. 셀 내부의 '"' 문자가 '"' 2개로 치환된 것 - // 이 중 첫번째 경우의 좌측에 있는 것은 CSV 파일이 정상적이라면, + // 이 중 첫번째 경우의 좌측에 있는 것은 CSV 파일이 정상적이라면, // 무조건 STATE_NORMAL에 걸리게 되어있다. // 그러므로 여기서 걸리는 것은 1번의 우측 경우나, 2번 경우 뿐이다. // 2번의 경우에는 무조건 '"' 문자가 2개씩 나타난다. 하지만 1번의 // 우측 경우에는 아니다. 이를 바탕으로 해서 코드를 짜면... if (text[cur] == quote) { - // 다음 문자가 '"' 문자라면, 즉 연속된 '"' 문자라면 + // 다음 문자가 '"' 문자라면, 즉 연속된 '"' 문자라면 // 이는 셀 내부의 '"' 문자가 치환된 것이다. - if (text[cur+1] == quote) + if (text[cur + 1] == quote) { token += quote; ++cur; } - // 다음 문자가 '"' 문자가 아니라면 + // 다음 문자가 '"' 문자가 아니라면 // 현재의 '"'문자는 셀의 끝을 알리는 문자라고 할 수 있다. else { @@ -194,14 +198,14 @@ bool cCsvFile::Load(const char* fileName, const char seperator, const char quote if (state == STATE_NORMAL) { Assert(row != NULL); - row->push_back(token.substr(0, token.size()-2)); + row->push_back(token.substr(0, token.size() - 2)); m_Rows.push_back(row); token.clear(); row = NULL; } else { - token = token.substr(0, token.size()-2) + "\r\n"; + token = token.substr(0, token.size() - 2) + "\r\n"; } } @@ -211,40 +215,47 @@ bool cCsvFile::Load(const char* fileName, const char seperator, const char quote //////////////////////////////////////////////////////////////////////////////// /// \brief 가지고 있는 내용을 CSV 파일에다 저장한다. /// \param fileName CSV 파일 이름 -/// \param append true일 경우, 기존의 파일에다 덧붙인다. false인 경우에는 +/// \param append true일 경우, 기존의 파일에다 덧붙인다. false인 경우에는 /// 기존의 파일 내용을 삭제하고, 새로 쓴다. /// \param seperator 필드 분리자로 사용할 글자. 기본값은 ','이다. /// \param quote 따옴표로 사용할 글자. 기본값은 '"'이다. /// \return bool 무사히 저장했다면 true, 에러가 생긴 경우에는 false //////////////////////////////////////////////////////////////////////////////// -bool cCsvFile::Save(const char* fileName, bool append, char seperator, char quote) const +bool cCsvFile::Save(const char *fileName, bool append, char seperator, char quote) const { Assert(seperator != quote); // 출력 모드에 따라 파일을 적당한 플래그로 생성한다. std::ofstream file; - if (append) { file.open(fileName, std::ios::out | std::ios::app); } - else { file.open(fileName, std::ios::out | std::ios::trunc); } + if (append) + { + 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 }; + char special_chars[5] = {seperator, quote, '\r', '\n', 0}; + char quote_escape_string[3] = {quote, quote, 0}; // 모든 행을 횡단하면서... - for (size_t i=0; isize()); return row->AsInt(index); @@ -377,7 +393,7 @@ int cCsvTable::AsInt(size_t index) const //////////////////////////////////////////////////////////////////////////////// double cCsvTable::AsDouble(size_t index) const { - const cCsvRow* const row = CurRow(); + const cCsvRow *const row = CurRow(); Assert(row); Assert(index < row->size()); return row->AsDouble(index); @@ -388,9 +404,9 @@ double cCsvTable::AsDouble(size_t index) const /// \param index 셀 인덱스 /// \return const char* 셀 값 //////////////////////////////////////////////////////////////////////////////// -const char* cCsvTable::AsStringByIndex(size_t index) const +const char *cCsvTable::AsStringByIndex(size_t index) const { - const cCsvRow* const row = CurRow(); + const cCsvRow *const row = CurRow(); Assert(row); Assert(index < row->size()); return row->AsString(index); @@ -409,10 +425,10 @@ void cCsvTable::Destroy() //////////////////////////////////////////////////////////////////////////////// /// \brief 현재 행을 반환한다. /// \return const cCsvRow* 액세스가 가능한 현재 행이 존재하는 경우에는 그 행의 -/// 포인터를 반환하고, 더 이상 액세스 가능한 행이 없는 경우에는 NULL을 +/// 포인터를 반환하고, 더 이상 액세스 가능한 행이 없는 경우에는 NULL을 /// 반환한다. //////////////////////////////////////////////////////////////////////////////// -const cCsvRow* const cCsvTable::CurRow() const +const cCsvRow *const cCsvTable::CurRow() const { if (m_CurRow < 0) { @@ -427,4 +443,3 @@ const cCsvRow* const cCsvTable::CurRow() const return m_File[m_CurRow]; } - diff --git a/src/db/src/CsvReader.h b/src/db/src/CsvReader.h index c9bce44..e543cbe 100644 --- a/src/db/src/CsvReader.h +++ b/src/db/src/CsvReader.h @@ -5,17 +5,17 @@ #include #if _MSC_VER - #include +#include #else - #include +#include #endif //////////////////////////////////////////////////////////////////////////////// /// \class cCsvAlias -/// \brief CSV 파일을 수정했을 때 발생하는 인덱스 문제를 줄이기 위한 +/// \brief CSV 파일을 수정했을 때 발생하는 인덱스 문제를 줄이기 위한 /// 별명 객체. /// -/// 예를 들어 0번 컬럼이 A에 관한 내용을 포함하고, 1번 컬럼이 B에 관한 내용을 +/// 예를 들어 0번 컬럼이 A에 관한 내용을 포함하고, 1번 컬럼이 B에 관한 내용을 /// 포함하고 있었는데... /// /// 
@@ -23,16 +23,16 @@
 /// int b = row.AsInt(1);
 ///
/// -/// 그 사이에 C에 관한 내용을 포함하는 컬럼이 끼어든 경우, 하드코딩되어 있는 -/// 1번을 찾아서 고쳐야 하는데, 상당히 에러가 발생하기 쉬운 작업이다. +/// 그 사이에 C에 관한 내용을 포함하는 컬럼이 끼어든 경우, 하드코딩되어 있는 +/// 1번을 찾아서 고쳐야 하는데, 상당히 에러가 발생하기 쉬운 작업이다. /// /// 
 /// int a = row.AsInt(0);
 /// int c = row.AsInt(1);
 /// int b = row.AsInt(2); <-- 이 부분을 일일이 신경써야 한다.
 ///
-/// -/// 이 부분을 문자열로 처리하면 유지보수에 들어가는 수고를 약간이나마 줄일 수 +/// +/// 이 부분을 문자열로 처리하면 유지보수에 들어가는 수고를 약간이나마 줄일 수 /// 있다. //////////////////////////////////////////////////////////////////////////////// @@ -47,49 +47,45 @@ private: typedef std::map INDEX2NAME_MAP; #endif - NAME2INDEX_MAP m_Name2Index; ///< 셀 인덱스 대신으로 사용하기 위한 이름들 - INDEX2NAME_MAP m_Index2Name; ///< 잘못된 alias를 검사하기 위한 추가적인 맵 - + NAME2INDEX_MAP m_Name2Index; ///< 셀 인덱스 대신으로 사용하기 위한 이름들 + INDEX2NAME_MAP m_Index2Name; ///< 잘못된 alias를 검사하기 위한 추가적인 맵 public: /// \brief 생성자 - cCsvAlias() {} + cCsvAlias() {} /// \brief 소멸자 virtual ~cCsvAlias() {} - public: /// \brief 셀을 액세스할 때, 숫자 대신 사용할 이름을 등록한다. - void AddAlias(const char* name, size_t index); + void AddAlias(const char *name, size_t index); /// \brief 모든 데이터를 삭제한다. void Destroy(); /// \brief 숫자 인덱스를 이름으로 변환한다. - const char* operator [] (size_t index) const; + const char *operator[](size_t index) const; /// \brief 이름을 숫자 인덱스로 변환한다. - size_t operator [] (const char* name) const; - + size_t operator[](const char *name) const; private: /// \brief 복사 생성자 금지 - cCsvAlias(const cCsvAlias&) {} + cCsvAlias(const cCsvAlias &) {} /// \brief 대입 연산자 금지 - const cCsvAlias& operator = (const cCsvAlias&) { return *this; } + const cCsvAlias &operator=(const cCsvAlias &) { return *this; } }; - //////////////////////////////////////////////////////////////////////////////// -/// \class cCsvRow +/// \class cCsvRow /// \brief CSV 파일의 한 행을 캡슐화한 클래스 /// /// CSV의 기본 포맷은 엑셀에서 보이는 하나의 셀을 ',' 문자로 구분한 것이다. -/// 하지만, 셀 안에 특수 문자로 쓰이는 ',' 문자나 '"' 문자가 들어갈 경우, +/// 하지만, 셀 안에 특수 문자로 쓰이는 ',' 문자나 '"' 문자가 들어갈 경우, /// 모양이 약간 이상하게 변한다. 다음은 그 변화의 예이다. -/// +/// /// 
 /// 엑셀에서 보이는 모양 | 실제 CSV 파일에 들어가있는 모양
 /// ---------------------+----------------------------------------------------
@@ -100,7 +96,7 @@ private:
 /// "Item,Price"         | """Item,Price"""
 /// Item",Price          | "Item"",Price"
 ///
-/// +/// /// 이 예로서 다음과 같은 사항을 알 수 있다. /// - 셀 내부에 ',' 또는 '"' 문자가 들어갈 경우, 셀 좌우에 '"' 문자가 생긴다. /// - 셀 내부의 '"' 문자는 2개로 치환된다. @@ -117,7 +113,6 @@ public: /// \brief 소멸자 ~cCsvRow() {} - public: /// \brief 해당 셀의 데이터를 int 형으로 반환한다. int AsInt(size_t index) const { return atoi(at(index).c_str()); } @@ -126,33 +121,34 @@ public: double AsDouble(size_t index) const { return atof(at(index).c_str()); } /// \brief 해당 셀의 데이터를 문자열로 반환한다. - const char* AsString(size_t index) const { return at(index).c_str(); } + const char *AsString(size_t index) const { return at(index).c_str(); } /// \brief 해당하는 이름의 셀 데이터를 int 형으로 반환한다. - int AsInt(const char* name, const cCsvAlias& alias) const { - return atoi( at(alias[name]).c_str() ); + 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 { - return atof( at(alias[name]).c_str() ); + 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 { - return at(alias[name]).c_str(); + const char *AsString(const char *name, const cCsvAlias &alias) const + { + return at(alias[name]).c_str(); } - private: /// \brief 복사 생성자 금지 - cCsvRow(const cCsvRow&) {} + cCsvRow(const cCsvRow &) {} /// \brief 대입 연산자 금지 - const cCsvRow& operator = (const cCsvRow&) { return *this; } + const cCsvRow &operator=(const cCsvRow &) { return *this; } }; - //////////////////////////////////////////////////////////////////////////////// /// \class cCsvFile /// \brief CSV(Comma Seperated Values) 파일을 read/write하기 위한 클래스 @@ -179,18 +175,17 @@ private: /// file.save("test.csv", false); /// /// -/// \todo 파일에서만 읽어들일 것이 아니라, 메모리 소스로부터 읽는 함수도 +/// \todo 파일에서만 읽어들일 것이 아니라, 메모리 소스로부터 읽는 함수도 /// 있어야 할 듯 하다. //////////////////////////////////////////////////////////////////////////////// class cCsvFile { private: - typedef std::vector ROWS; + typedef std::vector ROWS; ROWS m_Rows; ///< 행 컬렉션 - public: /// \brief 생성자 cCsvFile() {} @@ -198,44 +193,41 @@ public: /// \brief 소멸자 virtual ~cCsvFile() { Destroy(); } - public: /// \brief 지정된 이름의 CSV 파일을 로드한다. - bool Load(const char* fileName, const char seperator=',', const char quote='"'); + bool Load(const char *fileName, const char seperator = ',', const char quote = '"'); /// \brief 가지고 있는 내용을 CSV 파일에다 저장한다. - bool Save(const char* fileName, bool append=false, char seperator=',', char quote='"') const; + bool Save(const char *fileName, bool append = false, char seperator = ',', char quote = '"') const; /// \brief 모든 데이터를 메모리에서 삭제한다. void Destroy(); /// \brief 해당하는 인덱스의 행을 반환한다. - cCsvRow* operator [] (size_t index); + cCsvRow *operator[](size_t index); /// \brief 해당하는 인덱스의 행을 반환한다. - const cCsvRow* operator [] (size_t index) const; + const cCsvRow *operator[](size_t index) const; /// \brief 행의 갯수를 반환한다. size_t GetRowCount() const { return m_Rows.size(); } - private: /// \brief 복사 생성자 금지 - cCsvFile(const cCsvFile&) {} + cCsvFile(const cCsvFile &) {} /// \brief 대입 연산자 금지 - const cCsvFile& operator = (const cCsvFile&) { return *this; } + const cCsvFile &operator=(const cCsvFile &) { return *this; } }; - //////////////////////////////////////////////////////////////////////////////// /// \class cCsvTable -/// \brief CSV 파일을 이용해 테이블 데이터를 로드하는 경우가 많은데, 이 클래스는 +/// \brief CSV 파일을 이용해 테이블 데이터를 로드하는 경우가 많은데, 이 클래스는 /// 그 작업을 좀 더 쉽게 하기 위해 만든 유틸리티 클래스다. /// -/// CSV 파일을 로드하는 경우, 숫자를 이용해 셀을 액세스해야 하는데, CSV -/// 파일의 포맷이 바뀌는 경우, 이 숫자들을 변경해줘야한다. 이 작업이 꽤 -/// 신경 집중을 요구하는 데다가, 에러가 발생하기 쉽다. 그러므로 숫자로 +/// CSV 파일을 로드하는 경우, 숫자를 이용해 셀을 액세스해야 하는데, CSV +/// 파일의 포맷이 바뀌는 경우, 이 숫자들을 변경해줘야한다. 이 작업이 꽤 +/// 신경 집중을 요구하는 데다가, 에러가 발생하기 쉽다. 그러므로 숫자로 /// 액세스하기보다는 문자열로 액세스하는 것이 약간 느리지만 낫다고 할 수 있다. /// /// sample @@ -250,7 +242,7 @@ private: /// while (table.next()) /// { /// std::string item_class = table.AsString("ItemClass"); -/// int item_type = table.AsInt("ItemType"); +/// int item_type = table.AsInt("ItemType"); /// } /// } /// @@ -258,12 +250,11 @@ private: class cCsvTable { -public : - cCsvFile m_File; ///< CSV 파일 객체 +public: + cCsvFile m_File; ///< CSV 파일 객체 private: - cCsvAlias m_Alias; ///< 문자열을 셀 인덱스로 변환하기 위한 객체 - int m_CurRow; ///< 현재 횡단 중인 행 번호 - + cCsvAlias m_Alias; ///< 문자열을 셀 인덱스로 변환하기 위한 객체 + int m_CurRow; ///< 현재 횡단 중인 행 번호 public: /// \brief 생성자 @@ -272,13 +263,12 @@ public: /// \brief 소멸자 virtual ~cCsvTable(); - public: /// \brief 지정된 이름의 CSV 파일을 로드한다. - bool Load(const char* fileName, const char seperator=',', const char quote='"'); + bool Load(const char *fileName, const char seperator = ',', const char quote = '"'); /// \brief 셀을 액세스할 때, 숫자 대신 사용할 이름을 등록한다. - void AddAlias(const char* name, size_t index) { m_Alias.AddAlias(name, index); } + void AddAlias(const char *name, size_t index) { m_Alias.AddAlias(name, index); } /// \brief 다음 행으로 넘어간다. bool Next(); @@ -293,30 +283,29 @@ public: double AsDouble(size_t index) const; /// \brief 인덱스를 이용해 std::string 형으로 셀값을 반환한다. - const char* AsStringByIndex(size_t index) const; + const char *AsStringByIndex(size_t index) const; /// \brief 셀 이름을 이용해 int 형으로 셀값을 반환한다. - int AsInt(const char* name) const { return AsInt(m_Alias[name]); } + int AsInt(const char *name) const { return AsInt(m_Alias[name]); } /// \brief 셀 이름을 이용해 double 형으로 셀값을 반환한다. - double AsDouble(const char* name) const { return AsDouble(m_Alias[name]); } + double AsDouble(const char *name) const { return AsDouble(m_Alias[name]); } /// \brief 셀 이름을 이용해 std::string 형으로 셀값을 반환한다. - const char* AsString(const char* name) const { return AsStringByIndex(m_Alias[name]); } + const char *AsString(const char *name) const { return AsStringByIndex(m_Alias[name]); } /// \brief alias를 포함해 모든 데이터를 삭제한다. void Destroy(); - private: /// \brief 현재 행을 반환한다. - const cCsvRow* const CurRow() const; + const cCsvRow *const CurRow() const; /// \brief 복사 생성자 금지 - cCsvTable(const cCsvTable&) {} + cCsvTable(const cCsvTable &) {} /// \brief 대입 연산자 금지 - const cCsvTable& operator = (const cCsvTable&) { return *this; } + const cCsvTable &operator=(const cCsvTable &) { return *this; } }; #endif //__CSVFILE_H__ diff --git a/src/db/src/DBManager.cpp b/src/db/src/DBManager.cpp index 663021a..4b1e663 100644 --- a/src/db/src/DBManager.cpp +++ b/src/db/src/DBManager.cpp @@ -6,183 +6,179 @@ 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_directSQL[i] = NULL; - m_asyncSQL[i] = NULL; - } -} + m_connPool = std::make_shared( + db_address, db_port, db_name, user, pwd, + 10, // poolSize + 60 // idleTimeoutSeconds + ); -void CDBManager::Destroy() -{ - Clear(); + // 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; + } + } + + SPDLOG_INFO("Connected to PostgreSQL at {}:{}, DB: {}", db_address, db_port, db_name); + return true; + } + catch (const std::exception &ex) + { + SPDLOG_ERROR("Exception while connecting to DB: {}", ex.what()); + return false; + } } void CDBManager::Clear() { - for (int i = 0; i < SQL_MAX_NUM; ++i) - { - if (m_mainSQL[i]) - { - 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(); + std::lock_guard lock(m_queueMutex); + std::queue> empty; + m_queryQueue.swap(empty); } void CDBManager::Quit() { - for (int i = 0; i < SQL_MAX_NUM; ++i) + if (m_quit.exchange(1) == 0) { - if (m_mainSQL[i]) - m_mainSQL[i]->Quit(); - - if (m_asyncSQL[i]) - m_asyncSQL[i]->Quit(); - - if (m_directSQL[i]) - m_directSQL[i]->Quit(); + StopWorkerThread(); + if (m_connPool) + { + m_connPool.reset(); + } } } -SQLMsg * CDBManager::PopResult() +std::shared_ptr CDBManager::GetConnectionPool() { - SQLMsg * p; - - for (int i = 0; i < SQL_MAX_NUM; ++i) - if (m_mainSQL[i] && m_mainSQL[i]->PopResult(&p)) - return p; - - return NULL; + return m_connPool; } -SQLMsg * CDBManager::PopResult(eSQL_SLOT slot) +void CDBManager::AsyncQuery(const std::string &query, const pqxx::params ¶ms) { - SQLMsg * p; + auto msg = std::make_shared(++m_msgCounter, query, params); - 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) -{ - if (db_address == NULL || db_name == NULL) - 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(); - return false; + std::lock_guard lock(m_queueMutex); + m_queryQueue.push(msg); } + m_queueCondition.notify_one(); +} - SPDLOG_INFO("CREATING MAIN_SQL"); - m_mainSQL[iSlot] = new CAsyncSQL2; - if (!m_mainSQL[iSlot]->Setup(db_address, user, pwd, db_name, g_stLocale.c_str(), false, db_port)) +size_t CDBManager::GetPendingQueryCount() const +{ + std::lock_guard lock(m_queueMutex); + return m_queryQueue.size(); +} + +size_t CDBManager::GetCompletedQueryCount() const +{ + return m_completedQueries.load(); +} + +void CDBManager::ResetQueryStats() +{ + m_completedQueries = 0; +} + +void CDBManager::StartWorkerThread() +{ + if (!m_workerRunning.exchange(true)) { - Clear(); - 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(); - return false; - } - - return true; -} - -SQLMsg * CDBManager::DirectQuery(const char * c_pszQuery, int iSlot) -{ - return m_directSQL[iSlot]->DirectQuery(c_pszQuery); -} - -extern CPacketInfo g_query_info; -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); - //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) -{ - assert(iSlot < SQL_MAX_NUM); - m_asyncSQL[iSlot]->AsyncQuery(c_pszQuery); - ++g_query_count[1]; -} - -unsigned int CDBManager::EscapeString(void *to, const void *from, unsigned int length, int iSlot) -{ - assert(iSlot < SQL_MAX_NUM); - 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); - 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(); + m_workerThread = std::thread(&CDBManager::WorkerLoop, this); } } +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 msg; + + { + std::unique_lock 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 msg) +{ + 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); + 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); + } + + ++m_completedQueries; +} \ No newline at end of file diff --git a/src/db/src/DBManager.h b/src/db/src/DBManager.h index 2ddeb88..e05e16c 100644 --- a/src/db/src/DBManager.h +++ b/src/db/src/DBManager.h @@ -1,97 +1,48 @@ -// vim:ts=8 sw=4 #ifndef __INC_METIN2_DB_DBMANAGER_H__ #define __INC_METIN2_DB_DBMANAGER_H__ -// 디비 커넥션 클래스의 목적은... 디비에 접속해서 쿼리보내고 결과 받아오는 -// 모든 일들을 처리한다. -// 코드 by 꼬붕 후로그래머 아노아~ = _=)b -#include - -#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, -}; +#include +#include +#include class CDBManager : public singleton { - protected: - void Initialize(); - void Destroy(); - - public: +public: CDBManager(); virtual ~CDBManager(); - void Clear(); - void Quit(); + 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 GetConnectionPool(); - void ReturnQuery(const char * c_pszQuery, int iType, DWORD dwIdent, void * pvData, int iSlot = SQL_PLAYER); - void AsyncQuery(const char * c_pszQuery, int iSlot = SQL_PLAYER); - SQLMsg * DirectQuery(const char * c_pszQuery, int iSlot = SQL_PLAYER); + // Async Query - SQLMsg * PopResult(); - SQLMsg * PopResult(eSQL_SLOT slot ); + void AsyncQuery(const std::string &query, const pqxx::params ¶ms = pqxx::params{}); - unsigned int EscapeString(void * to, const void * from, unsigned int length, int iSlot = SQL_PLAYER); + size_t GetPendingQueryCount() const; + size_t GetCompletedQueryCount() const; + void ResetQueryStats(); - DWORD CountReturnQuery(int i) { return m_mainSQL[i] ? m_mainSQL[i]->CountQuery() : 0; } - 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; } +private: + std::shared_ptr m_connPool; + std::atomic m_quit{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; } + // Async Query - void ResetCounter() - { - for (int i = 0; i < SQL_MAX_NUM; ++i) - { - if (m_mainSQL[i]) - { - m_mainSQL[i]->ResetQueryFinished(); - m_mainSQL[i]->ResetCopiedQueryCount(); - } + void StartWorkerThread(); + void StopWorkerThread(); + void WorkerLoop(); + void ProcessQuery(std::shared_ptr msg); - if (m_asyncSQL[i]) - { - m_asyncSQL[i]->ResetQueryFinished(); - m_asyncSQL[i]->ResetCopiedQueryCount(); - } - } - } - - private: - CAsyncSQL2 * m_mainSQL[SQL_MAX_NUM]; - CAsyncSQL2 * m_directSQL[SQL_MAX_NUM]; - CAsyncSQL2 * m_asyncSQL[SQL_MAX_NUM]; - - int m_quit; // looping flag - - //CHARSET - public: - void SetLocale(const char * szLocale ); - void QueryLocaleSet(); - private: - - //END_CHARSET + std::queue> m_queryQueue; + mutable std::mutex m_queueMutex; + std::condition_variable m_queueCondition; + std::thread m_workerThread; + std::atomic m_msgCounter{0}; + std::atomic m_completedQueries{0}; + std::atomic m_workerRunning{false}; }; #endif diff --git a/src/db/src/GuildManager.cpp b/src/db/src/GuildManager.cpp index 5799b2f..a29389a 100644 --- a/src/db/src/GuildManager.cpp +++ b/src/db/src/GuildManager.cpp @@ -14,15 +14,24 @@ bool isEurope() { do { - if (g_stLocale.compare("germany") == 0) break; - if (g_stLocale.compare("france") == 0) break; - if (g_stLocale.compare("italy") == 0) break; - if (g_stLocale.compare("spain") == 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; + if (g_stLocale.compare("germany") == 0) + break; + if (g_stLocale.compare("france") == 0) + break; + if (g_stLocale.compare("italy") == 0) + break; + if (g_stLocale.compare("spain") == 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); @@ -33,10 +42,12 @@ bool isEurope() DWORD GetGuildWarWaitStartDuration() { // const int GUILD_WAR_WAIT_START_DURATION = 60; - // const int GUILD_WAR_WAIT_START_DURATION = 5; + // const int GUILD_WAR_WAIT_START_DURATION = 5; - if (isEurope() == true) return 60; - else return 5; + if (isEurope() == true) + return 60; + else + return 5; } DWORD GetGuildWarReserveSeconds() @@ -44,11 +55,13 @@ DWORD GetGuildWarReserveSeconds() // const int GUILD_WAR_RESERVE_SECONDS = 180; // const int GUILD_WAR_RESERVE_SECONDS = 10; - if (isEurope() == true) return 180; - else return 10; + if (isEurope() == true) + return 180; + else + return 10; } -namespace +namespace { struct FSendPeerWar { @@ -65,7 +78,7 @@ namespace p.dwGuildTo = GID2; } - void operator() (CPeer* peer) + void operator()(CPeer *peer) { if (peer->GetChannel() == 0) return; @@ -87,7 +100,7 @@ namespace pck.lBetScore = iBetScore; } - void operator() (CPeer* peer) + void operator()(CPeer *peer) { if (peer->GetChannel() == 0) return; @@ -115,7 +128,7 @@ CGuildManager::~CGuildManager() } } -TGuild & CGuildManager::TouchGuild(DWORD GID) +TGuild &CGuildManager::TouchGuild(DWORD GID) { itertype(m_map_kGuild) it = m_map_kGuild.find(GID); @@ -127,7 +140,7 @@ TGuild & CGuildManager::TouchGuild(DWORD GID) return m_map_kGuild[GID]; } -void CGuildManager::ParseResult(SQLResult * pRes) +void CGuildManager::ParseResult(SQLResult *pRes) { MYSQL_ROW row; @@ -135,7 +148,7 @@ void CGuildManager::ParseResult(SQLResult * pRes) { DWORD GID = strtoul(row[0], NULL, 10); - TGuild & r_info = TouchGuild(GID); + TGuild &r_info = TouchGuild(GID); strlcpy(r_info.szName, row[1], sizeof(r_info.szName)); str_to_number(r_info.ladder_point, row[2]); @@ -146,12 +159,12 @@ void CGuildManager::ParseResult(SQLResult * pRes) str_to_number(r_info.level, row[7]); SPDLOG_DEBUG( - "GuildWar: {:24} ladder {:<5} win {:<3} draw {:<3} loss {:<3}", - r_info.szName, - r_info.ladder_point, - r_info.win, - r_info.draw, - r_info.loss); + "GuildWar: {:24} ladder {:<5} win {:<3} draw {:<3} loss {:<3}", + r_info.szName, + r_info.ladder_point, + r_info.win, + r_info.draw, + r_info.loss); } } @@ -214,7 +227,7 @@ int CGuildManager::GetRanking(DWORD dwGID) return std::clamp(it->second, 0, GUILD_RANK_MAX_NUM); } -void CGuildManager::ResultRanking(MYSQL_RES * pRes) +void CGuildManager::ResultRanking(MYSQL_RES *pRes) { if (!pRes) return; @@ -228,8 +241,10 @@ void CGuildManager::ResultRanking(MYSQL_RES * pRes) while ((row = mysql_fetch_row(pRes))) { - DWORD dwGID = 0; str_to_number(dwGID, row[0]); - int iLadderPoint = 0; str_to_number(iLadderPoint, row[2]); + DWORD dwGID = 0; + str_to_number(dwGID, row[0]); + int iLadderPoint = 0; + str_to_number(iLadderPoint, row[2]); if (iLadderPoint != iLastLadderPoint) ++iRank; @@ -263,14 +278,14 @@ void CGuildManager::Update() while (!m_pqOnWar.empty() && (m_pqOnWar.top().first <= now || (m_pqOnWar.top().second && m_pqOnWar.top().second->bEnd))) { - TGuildWarPQElement * e = m_pqOnWar.top().second; + TGuildWarPQElement *e = m_pqOnWar.top().second; m_pqOnWar.pop(); if (e) { if (!e->bEnd) - WarEnd(e->GID[0], e->GID[1], false); + WarEnd(e->GID[0], e->GID[1], false); delete e; } @@ -280,7 +295,7 @@ void CGuildManager::Update() // GUILD_SKILL_COOLTIME_BUG_FIX while (!m_pqSkill.empty() && m_pqSkill.top().first <= now) { - const TGuildSkillUsed& s = m_pqSkill.top().second; + const TGuildSkillUsed &s = m_pqSkill.top().second; CClientManager::instance().SendGuildSkillUsable(s.GID, s.dwSkillVnum, true); m_pqSkill.pop(); } @@ -288,7 +303,7 @@ void CGuildManager::Update() while (!m_pqWaitStart.empty() && m_pqWaitStart.top().first <= now) { - const TGuildWaitStartInfo & ws = m_pqWaitStart.top().second; + const TGuildWaitStartInfo &ws = m_pqWaitStart.top().second; m_pqWaitStart.pop(); StartWar(ws.bType, ws.GID[0], ws.GID[1], ws.pkReserve); // insert new element to m_WarMap and m_pqOnWar @@ -301,10 +316,10 @@ void CGuildManager::Update() TPacketGuildWar p; - p.bType = ws.bType; - p.bWar = GUILD_WAR_ON_WAR; - p.dwGuildFrom = ws.GID[0]; - p.dwGuildTo = ws.GID[1]; + p.bType = ws.bType; + p.bWar = GUILD_WAR_ON_WAR; + p.dwGuildFrom = ws.GID[0]; + p.dwGuildTo = ws.GID[1]; CClientManager::instance().ForwardPacket(HEADER_DG_GUILD_WAR, &p, sizeof(p)); SPDLOG_DEBUG("GuildWar: GUILD sending start of wait start war {} {}", ws.GID[0], ws.GID[1]); @@ -313,26 +328,26 @@ void CGuildManager::Update() #define for_all(cont, it) for (typeof((cont).begin()) it = (cont).begin(); it != (cont).end(); ++it) -void CGuildManager::OnSetup(CPeer* peer) +void CGuildManager::OnSetup(CPeer *peer) { for_all(m_WarMap, it_cont) for_all(it_cont->second, it) - { - DWORD g1 = it_cont->first; - DWORD g2 = it->first; - TGuildWarPQElement* p = it->second.pElement; + { + DWORD g1 = it_cont->first; + DWORD g2 = it->first; + TGuildWarPQElement *p = it->second.pElement; - if (!p || p->bEnd) - continue; + if (!p || p->bEnd) + continue; - FSendPeerWar(p->bType, GUILD_WAR_ON_WAR, g1, g2) (peer); - FSendGuildWarScore(p->GID[0], p->GID[1], p->iScore[0], p->iBetScore[0]); - FSendGuildWarScore(p->GID[1], p->GID[0], p->iScore[1], p->iBetScore[1]); - } + FSendPeerWar(p->bType, GUILD_WAR_ON_WAR, g1, g2)(peer); + FSendGuildWarScore(p->GID[0], p->GID[1], p->iScore[0], p->iBetScore[0]); + FSendGuildWarScore(p->GID[1], p->GID[0], p->iScore[1], p->iBetScore[1]); + } for_all(m_DeclareMap, it) { - FSendPeerWar(it->bType, GUILD_WAR_SEND_DECLARE, it->dwGuildID[0], it->dwGuildID[1]) (peer); + FSendPeerWar(it->bType, GUILD_WAR_SEND_DECLARE, it->dwGuildID[0], it->dwGuildID[1])(peer); } for_all(m_map_kWarReserve, it) @@ -393,8 +408,8 @@ bool CGuildManager::IsHalfWinLadderPoint(DWORD dwGuildWinner, DWORD dwGuildLoser itertype(m_mapGuildWarEndTime[GID1]) it = m_mapGuildWarEndTime[GID1].find(GID2); - if (it != m_mapGuildWarEndTime[GID1].end() && - it->second + GUILD_WAR_LADDER_HALF_PENALTY_TIME > CClientManager::instance().GetCurrentTime()) + if (it != m_mapGuildWarEndTime[GID1].end() && + it->second + GUILD_WAR_LADDER_HALF_PENALTY_TIME > CClientManager::instance().GetCurrentTime()) return true; return false; @@ -480,7 +495,7 @@ void CGuildManager::WarEnd(DWORD GID1, DWORD GID2, bool bForceDraw) } TGuildWarInfo gwi = itWarMap->second; - TGuildWarPQElement * pData = gwi.pElement; + TGuildWarPQElement *pData = gwi.pElement; if (!pData || pData->bEnd) { @@ -524,7 +539,7 @@ void CGuildManager::WarEnd(DWORD GID1, DWORD GID2, bool bForceDraw) // // 길드전 정상 종료 -// +// void CGuildManager::RecvWarOver(DWORD dwGuildWinner, DWORD dwGuildLoser, bool bDraw, int lWarPrice) { SPDLOG_DEBUG("GuildWar: RecvWarOver : winner {} vs {} draw? {} war_price {}", dwGuildWinner, dwGuildLoser, bDraw ? 1 : 0, lWarPrice); @@ -540,7 +555,7 @@ void CGuildManager::RecvWarOver(DWORD dwGuildWinner, DWORD dwGuildLoser, bool bD if (it == m_WarMap[GID1].end()) return; - TGuildWarInfo & gw = it->second; + TGuildWarInfo &gw = it->second; // Award if (bDraw) @@ -574,14 +589,14 @@ void CGuildManager::RecvWarEnd(DWORD GID1, DWORD GID2) WarEnd(GID1, GID2, true); // 무조건 비정상 종료 시켜야 한다. } -void CGuildManager::StartWar(BYTE bType, DWORD GID1, DWORD GID2, CGuildWarReserve * pkReserve) +void CGuildManager::StartWar(BYTE bType, DWORD GID1, DWORD GID2, CGuildWarReserve *pkReserve) { SPDLOG_DEBUG("GuildWar: StartWar({},{},{})", bType, GID1, GID2); if (GID1 > GID2) std::swap(GID1, GID2); - TGuildWarInfo & gw = m_WarMap[GID1][GID2]; // map insert + TGuildWarInfo &gw = m_WarMap[GID1][GID2]; // map insert if (bType == GUILD_WAR_TYPE_FIELD) gw.tEndTime = CClientManager::instance().GetCurrentTime() + GUILD_WAR_DURATION; @@ -606,7 +621,7 @@ void CGuildManager::UpdateScore(DWORD dwGainGID, DWORD dwOppGID, int iScoreDelta if (it != m_WarMap[GID1].end()) { - TGuildWarPQElement * p = it->second.pElement; + TGuildWarPQElement *p = it->second.pElement; if (!p || p->bEnd) { @@ -635,7 +650,7 @@ void CGuildManager::UpdateScore(DWORD dwGainGID, DWORD dwOppGID, int iScoreDelta } SPDLOG_DEBUG("GuildWar: SendGuildWarScore guild {} wartype {} score_delta {} betscore_delta {} result {}, {}", - dwGainGID, p->bType, iScoreDelta, iBetScoreDelta, iNewScore, iNewBetScore); + dwGainGID, p->bType, iScoreDelta, iBetScoreDelta, iNewScore, iNewBetScore); CClientManager::instance().for_each_peer(FSendGuildWarScore(dwGainGID, dwOppGID, iNewScore, iNewBetScore)); } @@ -658,7 +673,7 @@ void CGuildManager::RemoveDeclare(DWORD guild_from, DWORD guild_to) if (it != m_DeclareMap.end()) m_DeclareMap.erase(it); - it = m_DeclareMap.find(TGuildDeclareInfo(0,guild_to, guild_from)); + it = m_DeclareMap.find(TGuildDeclareInfo(0, guild_to, guild_from)); if (it != m_DeclareMap.end()) m_DeclareMap.erase(it); @@ -674,14 +689,14 @@ bool CGuildManager::TakeBetPrice(DWORD dwGuildTo, DWORD dwGuildFrom, int lWarPri if (it_from == m_map_kGuild.end() || it_to == m_map_kGuild.end()) { SPDLOG_DEBUG("TakeBetPrice: guild not exist {} {}", - dwGuildFrom, dwGuildTo); + dwGuildFrom, dwGuildTo); return false; } if (it_from->second.gold < lWarPrice || it_to->second.gold < lWarPrice) { SPDLOG_DEBUG("TakeBetPrice: not enough gold {} {} to {} {}", - dwGuildFrom, it_from->second.gold, dwGuildTo, it_to->second.gold); + dwGuildFrom, it_from->second.gold, dwGuildTo, it_to->second.gold); return false; } @@ -693,7 +708,7 @@ bool CGuildManager::TakeBetPrice(DWORD dwGuildTo, DWORD dwGuildFrom, int lWarPri return true; } -bool CGuildManager::WaitStart(TPacketGuildWar * p) +bool CGuildManager::WaitStart(TPacketGuildWar *p) { if (p->lWarPrice > 0) if (!TakeBetPrice(p->dwGuildFrom, p->dwGuildTo, p->lWarPrice)) @@ -705,11 +720,11 @@ bool CGuildManager::WaitStart(TPacketGuildWar * p) m_pqWaitStart.push(std::make_pair(dwCurTime + GetGuildWarWaitStartDuration(), info)); SPDLOG_DEBUG( - "GuildWar: WaitStart g1 {} g2 {} price {} start at {}", - p->dwGuildFrom, - p->dwGuildTo, - p->lWarPrice, - dwCurTime + GetGuildWarWaitStartDuration()); + "GuildWar: WaitStart g1 {} g2 {} price {} start at {}", + p->dwGuildFrom, + p->dwGuildTo, + p->lWarPrice, + dwCurTime + GetGuildWarWaitStartDuration()); return true; } @@ -731,7 +746,7 @@ void CGuildManager::ChangeLadderPoint(DWORD GID, int change) if (it == m_map_kGuild.end()) return; - TGuild & r = it->second; + TGuild &r = it->second; r.ladder_point += change; @@ -798,7 +813,7 @@ void CGuildManager::DepositMoney(DWORD dwGuild, INT iGold) MoneyChange(dwGuild, it->second.gold); } -void CGuildManager::WithdrawMoney(CPeer* peer, DWORD dwGuild, INT iGold) +void CGuildManager::WithdrawMoney(CPeer *peer, DWORD dwGuild, INT iGold) { itertype(m_map_kGuild) it = m_map_kGuild.find(dwGuild); @@ -841,63 +856,62 @@ void CGuildManager::WithdrawMoneyReply(DWORD dwGuild, BYTE bGiveSuccess, INT iGo // // 예약 길드전(관전자가 배팅할 수 있다) // -const int c_aiScoreByLevel[GUILD_MAX_LEVEL+1] = -{ - 500, // level 0 = 500 probably error - 500, // 1 - 1000, - 2000, - 3000, - 4000, - 6000, - 8000, - 10000, - 12000, - 15000, // 10 - 18000, - 21000, - 24000, - 28000, - 32000, - 36000, - 40000, - 45000, - 50000, - 55000, +const int c_aiScoreByLevel[GUILD_MAX_LEVEL + 1] = + { + 500, // level 0 = 500 probably error + 500, // 1 + 1000, + 2000, + 3000, + 4000, + 6000, + 8000, + 10000, + 12000, + 15000, // 10 + 18000, + 21000, + 24000, + 28000, + 32000, + 36000, + 40000, + 45000, + 50000, + 55000, }; -const int c_aiScoreByRanking[GUILD_RANK_MAX_NUM+1] = -{ - 0, - 55000, // 1위 - 50000, - 45000, - 40000, - 36000, - 32000, - 28000, - 24000, - 21000, - 18000, // 10위 - 15000, - 12000, - 10000, - 8000, - 6000, - 4000, - 3000, - 2000, - 1000, - 500 // 20위 +const int c_aiScoreByRanking[GUILD_RANK_MAX_NUM + 1] = + { + 0, + 55000, // 1위 + 50000, + 45000, + 40000, + 36000, + 32000, + 28000, + 24000, + 21000, + 18000, // 10위 + 15000, + 12000, + 10000, + 8000, + 6000, + 4000, + 3000, + 2000, + 1000, + 500 // 20위 }; 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" - }; + 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"}; for (int i = 0; i < 2; ++i) { @@ -928,14 +942,14 @@ void CGuildManager::BootReserveWar() str_to_number(t.lHandicap, row[col++]); t.bStarted = 0; - CGuildWarReserve * pkReserve = new CGuildWarReserve(t); + CGuildWarReserve *pkReserve = new CGuildWarReserve(t); char buf[512]; snprintf(buf, sizeof(buf), "GuildWar: BootReserveWar : step %d id %u GID1 %u GID2 %u", i, t.dwID, t.dwGuildFrom, t.dwGuildTo); // i == 0 이면 길드전 도중 DB가 튕긴 것이므로 무승부 처리한다. // 또는, 5분 이하 남은 예약 길드전도 무승부 처리한다. (각자의 배팅액을 돌려준다) - //if (i == 0 || (int) t.dwTime - CClientManager::instance().GetCurrentTime() < 60 * 5) - if (i == 0 || (int) t.dwTime - CClientManager::instance().GetCurrentTime() < 0) + // if (i == 0 || (int) t.dwTime - CClientManager::instance().GetCurrentTime() < 60 * 5) + if (i == 0 || (int)t.dwTime - CClientManager::instance().GetCurrentTime() < 0) { if (i == 0) SPDLOG_DEBUG("{} : DB was shutdowned while war is being.", buf); @@ -958,16 +972,17 @@ int GetAverageGuildMemberLevel(DWORD dwGID) { char szQuery[QUERY_MAX_LEN]; - snprintf(szQuery, sizeof(szQuery), - "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()); + snprintf(szQuery, sizeof(szQuery), + "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()); std::unique_ptr msg(CDBManager::instance().DirectQuery(szQuery)); MYSQL_ROW row; row = mysql_fetch_row(msg->Get()->pSQLResult); - int nAverageLevel = 0; str_to_number(nAverageLevel, row[0]); + int nAverageLevel = 0; + str_to_number(nAverageLevel, row[0]); return nAverageLevel; } @@ -982,11 +997,12 @@ int GetGuildMemberCount(DWORD dwGID) MYSQL_ROW row; row = mysql_fetch_row(msg->Get()->pSQLResult); - DWORD dwCount = 0; str_to_number(dwCount, row[0]); + DWORD dwCount = 0; + str_to_number(dwCount, row[0]); return dwCount; } -bool CGuildManager::ReserveWar(TPacketGuildWar * p) +bool CGuildManager::ReserveWar(TPacketGuildWar *p) { DWORD GID1 = p->dwGuildFrom; DWORD GID2 = p->dwGuildTo; @@ -1011,7 +1027,7 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p) int lvp, rkp, alv, mc; // 파워 계산 - TGuild & k1 = TouchGuild(GID1); + TGuild &k1 = TouchGuild(GID1); lvp = c_aiScoreByLevel[std::min(GUILD_MAX_LEVEL, k1.level)]; rkp = c_aiScoreByRanking[GetRanking(GID1)]; @@ -1023,11 +1039,11 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p) polyPower.SetVar("alv", alv); polyPower.SetVar("mc", mc); - t.lPowerFrom = (int) polyPower.Eval(); + t.lPowerFrom = (int)polyPower.Eval(); SPDLOG_DEBUG("GuildWar: {} lvp {} rkp {} alv {} mc {} power {}", GID1, lvp, rkp, alv, mc, t.lPowerFrom); // 파워 계산 - TGuild & k2 = TouchGuild(GID2); + TGuild &k2 = TouchGuild(GID2); lvp = c_aiScoreByLevel[std::min(GUILD_MAX_LEVEL, k2.level)]; rkp = c_aiScoreByRanking[GetRanking(GID2)]; @@ -1039,7 +1055,7 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p) polyPower.SetVar("alv", alv); polyPower.SetVar("mc", mc); - t.lPowerTo = (int) polyPower.Eval(); + t.lPowerTo = (int)polyPower.Eval(); SPDLOG_DEBUG("GuildWar: {} lvp {} rkp {} alv {} mc {} power {}", GID2, lvp, rkp, alv, mc, t.lPowerTo); // 핸디캡 계산 @@ -1054,16 +1070,16 @@ bool CGuildManager::ReserveWar(TPacketGuildWar * p) polyHandicap.SetVar("pB", t.lPowerTo); } - t.lHandicap = (int) polyHandicap.Eval(); + t.lHandicap = (int)polyHandicap.Eval(); SPDLOG_DEBUG("GuildWar: handicap {}", t.lHandicap); // 쿼리 char szQuery[512]; snprintf(szQuery, sizeof(szQuery), - "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)", - GID1, GID2, p->bType, p->lWarPrice, p->lInitialScore, t.lPowerFrom, t.lPowerTo, t.lHandicap); + "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)", + GID1, GID2, p->bType, p->lWarPrice, p->lInitialScore, t.lPowerFrom, t.lPowerTo, t.lHandicap); std::unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); @@ -1091,15 +1107,15 @@ void CGuildManager::ProcessReserveWar() { itertype(m_map_kWarReserve) it2 = it++; - CGuildWarReserve * pk = it2->second; - TGuildWarReserve & r = pk->GetDataRef(); + CGuildWarReserve *pk = it2->second; + TGuildWarReserve &r = pk->GetDataRef(); if (!r.bStarted && r.dwTime - 1800 <= dwCurTime) // 30분 전부터 알린다. { - int iMin = (int) ceil((int)(r.dwTime - dwCurTime) / 60.0); + int iMin = (int)ceil((int)(r.dwTime - dwCurTime) / 60.0); - TGuild & r_1 = m_map_kGuild[r.dwGuildFrom]; - TGuild & r_2 = m_map_kGuild[r.dwGuildTo]; + TGuild &r_1 = m_map_kGuild[r.dwGuildFrom]; + TGuild &r_2 = m_map_kGuild[r.dwGuildTo]; SPDLOG_DEBUG("GuildWar: started GID1 {} GID2 {} {} time {} min {}", r.dwGuildFrom, r.dwGuildTo, r.bStarted, dwCurTime - r.dwTime, iMin); @@ -1126,7 +1142,7 @@ void CGuildManager::ProcessReserveWar() pck.lInitialScore = r.lInitialScore; CClientManager::instance().ForwardPacket(HEADER_DG_GUILD_WAR, &pck, sizeof(TPacketGuildWar)); - //m_map_kWarReserve.erase(it2); + // m_map_kWarReserve.erase(it2); } else { @@ -1144,7 +1160,7 @@ void CGuildManager::ProcessReserveWar() } } -bool CGuildManager::Bet(DWORD dwID, const char * c_pszLogin, DWORD dwGold, DWORD dwGuild) +bool CGuildManager::Bet(DWORD dwID, const char *c_pszLogin, DWORD dwGold, DWORD dwGuild) { itertype(m_map_kWarReserve) it = m_map_kWarReserve.find(dwID); @@ -1154,7 +1170,7 @@ bool CGuildManager::Bet(DWORD dwID, const char * c_pszLogin, DWORD dwGold, DWORD { SPDLOG_DEBUG("WAR_RESERVE: Bet: cannot find reserve war by id {}", dwID); snprintf(szQuery, sizeof(szQuery), "INSERT INTO item_award (login, vnum, socket0, given_time) VALUES('%s', %d, %u, NOW())", - c_pszLogin, ITEM_ELK_VNUM, dwGold); + c_pszLogin, ITEM_ELK_VNUM, dwGold); CDBManager::instance().AsyncQuery(szQuery); return false; } @@ -1162,8 +1178,8 @@ bool CGuildManager::Bet(DWORD dwID, const char * c_pszLogin, DWORD dwGold, DWORD if (!it->second->Bet(c_pszLogin, dwGold, dwGuild)) { SPDLOG_DEBUG("WAR_RESERVE: Bet: cannot bet id {}, login {}, gold {}, guild {}", dwID, c_pszLogin, dwGold, dwGuild); - snprintf(szQuery, sizeof(szQuery), "INSERT INTO item_award (login, vnum, socket0, given_time) VALUES('%s', %d, %u, NOW())", - c_pszLogin, ITEM_ELK_VNUM, dwGold); + snprintf(szQuery, sizeof(szQuery), "INSERT INTO item_award (login, vnum, socket0, given_time) VALUES('%s', %d, %u, NOW())", + c_pszLogin, ITEM_ELK_VNUM, dwGold); CDBManager::instance().AsyncQuery(szQuery); return false; } @@ -1201,7 +1217,7 @@ bool CGuildManager::ChangeMaster(DWORD dwGID, DWORD dwFrom, DWORD dwTo) ////////////////////////////////////////////////////////////////////////////////////////// // Guild War Reserve Class ////////////////////////////////////////////////////////////////////////////////////////// -CGuildWarReserve::CGuildWarReserve(const TGuildWarReserve & rTable) +CGuildWarReserve::CGuildWarReserve(const TGuildWarReserve &rTable) { memcpy(&m_data, &rTable, sizeof(TGuildWarReserve)); m_iLastNoticeMin = -1; @@ -1218,10 +1234,10 @@ void CGuildWarReserve::Initialize() if (msgbet->Get()->uiNumRows) { - MYSQL_RES * res = msgbet->Get()->pSQLResult; + MYSQL_RES *res = msgbet->Get()->pSQLResult; MYSQL_ROW row; - char szLogin[LOGIN_MAX_LEN+1]; + char szLogin[LOGIN_MAX_LEN + 1]; DWORD dwGuild; DWORD dwGold; @@ -1237,12 +1253,12 @@ void CGuildWarReserve::Initialize() } } -void CGuildWarReserve::OnSetup(CPeer * peer) +void CGuildWarReserve::OnSetup(CPeer *peer) { if (m_data.bStarted) // 이미 시작된 것은 보내지 않는다. return; - FSendPeerWar(m_data.bType, GUILD_WAR_RESERVE, m_data.dwGuildFrom, m_data.dwGuildTo) (peer); + FSendPeerWar(m_data.bType, GUILD_WAR_RESERVE, m_data.dwGuildFrom, m_data.dwGuildTo)(peer); peer->EncodeHeader(HEADER_DG_GUILD_WAR_RESERVE_ADD, 0, sizeof(TGuildWarReserve)); peer->Encode(&m_data, sizeof(TGuildWarReserve)); @@ -1265,7 +1281,7 @@ void CGuildWarReserve::OnSetup(CPeer * peer) } } -bool CGuildWarReserve::Bet(const char * pszLogin, DWORD dwGold, DWORD dwGuild) +bool CGuildWarReserve::Bet(const char *pszLogin, DWORD dwGold, DWORD dwGuild) { char szQuery[1024]; @@ -1287,9 +1303,9 @@ bool CGuildWarReserve::Bet(const char * pszLogin, DWORD dwGold, DWORD dwGuild) return false; } - snprintf(szQuery, sizeof(szQuery), - "INSERT INTO guild_war_bet (war_id, login, gold, guild) VALUES(%u, '%s', %u, %u)", - m_data.dwID, pszLogin, dwGold, dwGuild); + snprintf(szQuery, sizeof(szQuery), + "INSERT INTO guild_war_bet (war_id, login, gold, guild) VALUES(%u, '%s', %u, %u)", + m_data.dwID, pszLogin, dwGold, dwGuild); std::unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); @@ -1306,8 +1322,8 @@ bool CGuildWarReserve::Bet(const char * pszLogin, DWORD dwGold, DWORD dwGuild) CClientManager::instance().ForwardPacket(HEADER_DG_GUILD_WAR_RESERVE_ADD, &m_data, sizeof(TGuildWarReserve)); - snprintf(szQuery, sizeof(szQuery), "UPDATE guild_war_reservation SET bet_from=%u,bet_to=%u WHERE id=%u", - m_data.dwBetFrom, m_data.dwBetTo, m_data.dwID); + snprintf(szQuery, sizeof(szQuery), "UPDATE guild_war_reservation SET bet_from=%u,bet_to=%u WHERE id=%u", + m_data.dwBetFrom, m_data.dwBetTo, m_data.dwID); CDBManager::instance().AsyncQuery(szQuery); @@ -1328,7 +1344,7 @@ bool CGuildWarReserve::Bet(const char * pszLogin, DWORD dwGold, DWORD dwGuild) // 무승부 처리: 대부분 승부가 나야 정상이지만, 서버 문제 등 특정 상황일 경우에는 // 무승부 처리가 있어야 한다. // -void CGuildWarReserve::Draw() +void CGuildWarReserve::Draw() { char szQuery[1024]; @@ -1352,11 +1368,11 @@ void CGuildWarReserve::Draw() while (it != mapBet.end()) { if (iRow == 0) - iLen += snprintf(szQuery + iLen, sizeof(szQuery) - iLen, "('%s', %d, %u, NOW())", - it->first.c_str(), ITEM_ELK_VNUM, it->second.second); + iLen += snprintf(szQuery + iLen, sizeof(szQuery) - iLen, "('%s', %d, %u, NOW())", + it->first.c_str(), ITEM_ELK_VNUM, it->second.second); else - iLen += snprintf(szQuery + iLen, sizeof(szQuery) - iLen, ",('%s', %d, %u, NOW())", - it->first.c_str(), ITEM_ELK_VNUM, it->second.second); + iLen += snprintf(szQuery + iLen, sizeof(szQuery) - iLen, ",('%s', %d, %u, NOW())", + it->first.c_str(), ITEM_ELK_VNUM, it->second.second); it++; @@ -1398,7 +1414,7 @@ void CGuildWarReserve::End(int iScoreFrom, int iScoreTo) } else { - if (m_data.lHandicap > iScoreTo - iScoreFrom) + if (m_data.lHandicap > iScoreTo - iScoreFrom) { SPDLOG_DEBUG("WAR_REWARD: End: failed to overcome handicap, To is strong but From won"); dwWinner = m_data.dwGuildFrom; @@ -1411,8 +1427,8 @@ void CGuildWarReserve::End(int iScoreFrom, int iScoreTo) } char szQuery[1024]; - snprintf(szQuery, sizeof(szQuery), "UPDATE guild_war_reservation SET started=1,winner=%u,result1=%d,result2=%d WHERE id=%u", - dwWinner, iScoreFrom, iScoreTo, m_data.dwID); + snprintf(szQuery, sizeof(szQuery), "UPDATE guild_war_reservation SET started=1,winner=%u,result1=%d,result2=%d WHERE id=%u", + dwWinner, iScoreFrom, iScoreTo, m_data.dwID); CDBManager::instance().AsyncQuery(szQuery); if (mapBet.empty()) @@ -1456,19 +1472,19 @@ void CGuildWarReserve::End(int iScoreFrom, int iScoreTo) continue; } - double ratio = (double) it->second.second / dwWinnerBet; + double ratio = (double)it->second.second / dwWinnerBet; // 10% 세금 공제 후 분배 SPDLOG_DEBUG("WAR_REWARD: {} {} ratio {}", it->first.c_str(), it->second.second, ratio); - DWORD dwGold = (DWORD) (dwTotalBet * ratio * 0.9); + DWORD dwGold = (DWORD)(dwTotalBet * ratio * 0.9); if (iRow == 0) iLen += snprintf(szQuery + iLen, sizeof(szQuery) - iLen, "('%s', %d, %u, NOW())", - it->first.c_str(), ITEM_ELK_VNUM, dwGold); + it->first.c_str(), ITEM_ELK_VNUM, dwGold); else iLen += snprintf(szQuery + iLen, sizeof(szQuery) - iLen, ",('%s', %d, %u, NOW())", - it->first.c_str(), ITEM_ELK_VNUM, dwGold); + it->first.c_str(), ITEM_ELK_VNUM, dwGold); ++it; @@ -1488,4 +1504,3 @@ void CGuildWarReserve::End(int iScoreFrom, int iScoreTo) break; } } - diff --git a/src/db/src/GuildManager.h b/src/db/src/GuildManager.h index 0ca963e..91bec82 100644 --- a/src/db/src/GuildManager.h +++ b/src/db/src/GuildManager.h @@ -10,7 +10,7 @@ enum { - GUILD_WARP_WAR_CHANNEL = 99 + GUILD_WARP_WAR_CHANNEL = 99 }; class CGuildWarReserve; @@ -27,12 +27,12 @@ struct TGuildDeclareInfo dwGuildID[1] = _dwGuildID2; } - bool operator < (const TGuildDeclareInfo& r) const + bool operator<(const TGuildDeclareInfo &r) const { return dwGuildID[0] < r.dwGuildID[0] || dwGuildID[0] == r.dwGuildID[0] && dwGuildID[1] < r.dwGuildID[1]; } - TGuildDeclareInfo& operator = (const TGuildDeclareInfo& r) + TGuildDeclareInfo &operator=(const TGuildDeclareInfo &r) { bType = r.bType; dwGuildID[0] = r.dwGuildID[0]; @@ -43,25 +43,25 @@ struct TGuildDeclareInfo struct TGuildWaitStartInfo { - BYTE bType; - DWORD GID[2]; - int lWarPrice; - int lInitialScore; - CGuildWarReserve * pkReserve; + BYTE bType; + DWORD GID[2]; + int lWarPrice; + int lInitialScore; + CGuildWarReserve *pkReserve; TGuildWaitStartInfo(BYTE _bType, - DWORD _g1, - DWORD _g2, - int _lWarPrice, - int _lInitialScore, - CGuildWarReserve * _pkReserve) + DWORD _g1, + DWORD _g2, + int _lWarPrice, + int _lInitialScore, + CGuildWarReserve *_pkReserve) : bType(_bType), lWarPrice(_lWarPrice), lInitialScore(_lInitialScore), pkReserve(_pkReserve) { GID[0] = _g1; GID[1] = _g2; } - bool operator < (const TGuildWaitStartInfo& r) const + bool operator<(const TGuildWaitStartInfo &r) const { return GID[0] < r.GID[0] || GID[0] == r.GID[0] && GID[1] < r.GID[1]; } @@ -69,11 +69,11 @@ struct TGuildWaitStartInfo struct TGuildWarPQElement { - bool bEnd; - BYTE bType; - DWORD GID[2]; - DWORD iScore[2]; - DWORD iBetScore[2]; + bool bEnd; + BYTE bType; + DWORD GID[2]; + DWORD iScore[2]; + DWORD iBetScore[2]; TGuildWarPQElement(BYTE _bType, DWORD GID1, DWORD GID2) : bEnd(false), bType(_bType) { @@ -87,19 +87,19 @@ struct TGuildWarPQElement struct TGuildSkillUsed { - DWORD GID; - DWORD dwSkillVnum; + DWORD GID; + DWORD dwSkillVnum; - // GUILD_SKILL_COOLTIME_BUG_FIX - TGuildSkillUsed(DWORD _GID, DWORD _dwSkillVnum) : GID(_GID), dwSkillVnum(_dwSkillVnum) - { - } - // END_OF_GUILD_SKILL_COOLTIME_BUG_FIX + // GUILD_SKILL_COOLTIME_BUG_FIX + TGuildSkillUsed(DWORD _GID, DWORD _dwSkillVnum) : GID(_GID), dwSkillVnum(_dwSkillVnum) + { + } + // END_OF_GUILD_SKILL_COOLTIME_BUG_FIX }; -inline bool operator < (const TGuildSkillUsed& a, const TGuildSkillUsed& b) +inline bool operator<(const TGuildSkillUsed &a, const TGuildSkillUsed &b) { - return a.GID < b.GID || a.GID == b.GID && a.dwSkillVnum < b.dwSkillVnum; + return a.GID < b.GID || a.GID == b.GID && a.dwSkillVnum < b.dwSkillVnum; } typedef struct SGuild @@ -109,115 +109,115 @@ typedef struct SGuild memset(szName, 0, sizeof(szName)); } - char szName[GUILD_NAME_MAX_LEN+1]; - int ladder_point; - int win; - int draw; - int loss; - int gold; - int level; + char szName[GUILD_NAME_MAX_LEN + 1]; + int ladder_point; + int win; + int draw; + int loss; + int gold; + int level; } TGuild; typedef struct SGuildWarInfo { - time_t tEndTime; - TGuildWarPQElement * pElement; - CGuildWarReserve * pkReserve; + time_t tEndTime; + TGuildWarPQElement *pElement; + CGuildWarReserve *pkReserve; - SGuildWarInfo() : pElement(NULL) - { - } + SGuildWarInfo() : pElement(NULL) + { + } } TGuildWarInfo; class CGuildWarReserve { - public: - CGuildWarReserve(const TGuildWarReserve& rTable); +public: + CGuildWarReserve(const TGuildWarReserve &rTable); void Initialize(); - TGuildWarReserve & GetDataRef() + TGuildWarReserve &GetDataRef() { - return m_data; + return m_data; } - void OnSetup(CPeer * peer); - bool Bet(const char * pszLogin, DWORD dwGold, DWORD dwGuild); - void Draw(); - void End(int iScoreFrom, int iScoreTo); + void OnSetup(CPeer *peer); + bool Bet(const char *pszLogin, DWORD dwGold, DWORD dwGuild); + void Draw(); + void End(int iScoreFrom, int iScoreTo); - int GetLastNoticeMin() { return m_iLastNoticeMin; } - void SetLastNoticeMin(int iMin) { m_iLastNoticeMin = iMin; } + int GetLastNoticeMin() { return m_iLastNoticeMin; } + void SetLastNoticeMin(int iMin) { m_iLastNoticeMin = iMin; } - private: - CGuildWarReserve(); // 기본 생성자를 사용하지 못하도록 의도적으로 구현하지 않음 +private: + CGuildWarReserve(); // 기본 생성자를 사용하지 못하도록 의도적으로 구현하지 않음 - TGuildWarReserve m_data; + TGuildWarReserve m_data; // > - std::map > mapBet; - int m_iLastNoticeMin; + std::map> mapBet; + int m_iLastNoticeMin; }; class CGuildManager : public singleton { - public: +public: CGuildManager(); virtual ~CGuildManager(); - void Initialize(); + void Initialize(); - void Load(DWORD dwGuildID); + void Load(DWORD dwGuildID); - TGuild & TouchGuild(DWORD GID); + TGuild &TouchGuild(DWORD GID); - void Update(); + void Update(); - void OnSetup(CPeer * peer); - void StartWar(BYTE bType, DWORD GID1, DWORD GID2, CGuildWarReserve * pkReserve = NULL); + void OnSetup(CPeer *peer); + void StartWar(BYTE bType, DWORD GID1, DWORD GID2, CGuildWarReserve *pkReserve = NULL); - void UpdateScore(DWORD guild_gain_point, DWORD guild_opponent, int iScore, int iBetScore); + void UpdateScore(DWORD guild_gain_point, DWORD guild_opponent, int iScore, int iBetScore); - void AddDeclare(BYTE bType, DWORD guild_from, DWORD guild_to); - void RemoveDeclare(DWORD guild_from, DWORD guild_to); + void AddDeclare(BYTE bType, DWORD guild_from, DWORD guild_to); + void RemoveDeclare(DWORD guild_from, DWORD guild_to); - bool TakeBetPrice(DWORD dwGuildTo, DWORD dwGuildFrom, int lWarPrice); + bool TakeBetPrice(DWORD dwGuildTo, DWORD dwGuildFrom, int lWarPrice); - bool WaitStart(TPacketGuildWar * p); + bool WaitStart(TPacketGuildWar *p); - void RecvWarEnd(DWORD GID1, DWORD GID2); - void RecvWarOver(DWORD dwGuildWinner, DWORD dwGuildLoser, bool bDraw, int lWarPrice); + void RecvWarEnd(DWORD GID1, DWORD GID2); + void RecvWarOver(DWORD dwGuildWinner, DWORD dwGuildLoser, bool bDraw, int lWarPrice); - void ChangeLadderPoint(DWORD GID, int change); + void ChangeLadderPoint(DWORD GID, int change); - void UseSkill(DWORD dwGuild, DWORD dwSkillVnum, DWORD dwCooltime); + void UseSkill(DWORD dwGuild, DWORD dwSkillVnum, DWORD dwCooltime); - INT GetGuildGold(DWORD dwGuild); - void DepositMoney(DWORD dwGuild, INT lGold); - void WithdrawMoney(CPeer* peer, DWORD dwGuild, INT lGold); - void WithdrawMoneyReply(DWORD dwGuild, BYTE bGiveSuccess, INT lGold); + INT GetGuildGold(DWORD dwGuild); + void DepositMoney(DWORD dwGuild, INT lGold); + void WithdrawMoney(CPeer *peer, DWORD dwGuild, INT lGold); + void WithdrawMoneyReply(DWORD dwGuild, BYTE bGiveSuccess, INT lGold); - void MoneyChange(DWORD dwGuild, DWORD dwGold); + void MoneyChange(DWORD dwGuild, DWORD dwGold); - void QueryRanking(); - void ResultRanking(MYSQL_RES * pRes); - int GetRanking(DWORD dwGID); + void QueryRanking(); + void ResultRanking(MYSQL_RES *pRes); + int GetRanking(DWORD dwGID); // // Reserve War // - void BootReserveWar(); - bool ReserveWar(TPacketGuildWar * p); - void ProcessReserveWar(); - bool Bet(DWORD dwID, const char * c_pszLogin, DWORD dwGold, DWORD dwGuild); + void BootReserveWar(); + bool ReserveWar(TPacketGuildWar *p); + void ProcessReserveWar(); + bool Bet(DWORD dwID, const char *c_pszLogin, DWORD dwGold, DWORD dwGuild); - void CancelWar(DWORD GID1, DWORD GID2); + void CancelWar(DWORD GID1, DWORD GID2); - bool ChangeMaster(DWORD dwGID, DWORD dwFrom, DWORD dwTo); + bool ChangeMaster(DWORD dwGID, DWORD dwFrom, DWORD dwTo); - private: - void ParseResult(SQLResult * pRes); +private: + void ParseResult(SQLResult *pRes); - void RemoveWar(DWORD GID1, DWORD GID2); // erase war from m_WarMap and set end on priority queue + void RemoveWar(DWORD GID1, DWORD GID2); // erase war from m_WarMap and set end on priority queue void WarEnd(DWORD GID1, DWORD GID2, bool bDraw = false); @@ -232,29 +232,29 @@ class CGuildManager : public singleton bool IsHalfWinLadderPoint(DWORD dwGuildWinner, DWORD dwGuildLoser); - std::map m_map_kGuild; - std::map > m_mapGuildWarEndTime; + std::map m_map_kGuild; + std::map> m_mapGuildWarEndTime; - std::set m_DeclareMap; // 선전 포고 상태를 저장 - std::map > m_WarMap; + std::set m_DeclareMap; // 선전 포고 상태를 저장 + std::map> m_WarMap; - typedef std::pair stPairGuildWar; - typedef std::pair stPairSkillUsed; - typedef std::pair stPairWaitStart; + typedef std::pair stPairGuildWar; + typedef std::pair stPairSkillUsed; + typedef std::pair stPairWaitStart; - std::priority_queue, std::greater > - m_pqOnWar; - std::priority_queue, std::greater > - m_pqWaitStart; - std::priority_queue, std::greater > - m_pqSkill; + std::priority_queue, std::greater> + m_pqOnWar; + std::priority_queue, std::greater> + m_pqWaitStart; + std::priority_queue, std::greater> + m_pqSkill; - std::map m_map_kWarReserve; - CPoly polyPower; - CPoly polyHandicap; + std::map m_map_kWarReserve; + CPoly polyPower; + CPoly polyHandicap; // GID Ranking - std::map map_kLadderPointRankingByGID; + std::map map_kLadderPointRankingByGID; }; #endif diff --git a/src/db/src/ItemAwardManager.cpp b/src/db/src/ItemAwardManager.cpp index 32a0d88..7c8f6e9 100644 --- a/src/db/src/ItemAwardManager.cpp +++ b/src/db/src/ItemAwardManager.cpp @@ -6,8 +6,6 @@ #include "ClientManager.h" - - DWORD g_dwLastCachedItemAwardID = 0; ItemAwardManager::ItemAwardManager() { @@ -24,9 +22,9 @@ void ItemAwardManager::RequestLoad() CDBManager::instance().ReturnQuery(szQuery, QID_ITEM_AWARD_LOAD, 0, NULL); } -void ItemAwardManager::Load(SQLMsg * pMsg) +void ItemAwardManager::Load(SQLMsg *pMsg) { - MYSQL_RES * pRes = pMsg->Get()->pSQLResult; + MYSQL_RES *pRes = pMsg->Get()->pSQLResult; for (uint i = 0; i < pMsg->Get()->uiNumRows; ++i) { @@ -39,10 +37,10 @@ void ItemAwardManager::Load(SQLMsg * pMsg) if (m_map_award.find(dwID) != m_map_award.end()) continue; - TItemAward * kData = new TItemAward; + TItemAward *kData = new TItemAward; memset(kData, 0, sizeof(TItemAward)); - kData->dwID = dwID; + kData->dwID = dwID; trim_and_lower(row[col++], kData->szLogin, sizeof(kData->szLogin)); str_to_number(kData->dwVnum, row[col++]); str_to_number(kData->dwCount, row[col++]); @@ -54,20 +52,20 @@ void ItemAwardManager::Load(SQLMsg * pMsg) if (row[col]) { strlcpy(kData->szWhy, row[col], sizeof(kData->szWhy)); - //게임 중에 why콜룸에 변동이 생기면 - char* whyStr = kData->szWhy; //why 콜룸 읽기 - char cmdStr[100] = ""; //why콜룸에서 읽은 값을 임시 문자열에 복사해둠 - strcpy(cmdStr,whyStr); //명령어 얻는 과정에서 토큰쓰면 원본도 토큰화 되기 때문 + // 게임 중에 why콜룸에 변동이 생기면 + char *whyStr = kData->szWhy; // why 콜룸 읽기 + char cmdStr[100] = ""; // why콜룸에서 읽은 값을 임시 문자열에 복사해둠 + strcpy(cmdStr, whyStr); // 명령어 얻는 과정에서 토큰쓰면 원본도 토큰화 되기 때문 char command[20] = ""; - strcpy(command,CClientManager::instance().GetCommand(cmdStr).c_str()); // command 얻기 - //SPDLOG_ERROR("{}, {}",pItemAward->dwID,command); - if( !(strcmp(command,"GIFT") )) // command 가 GIFT이면 + strcpy(command, CClientManager::instance().GetCommand(cmdStr).c_str()); // command 얻기 + // SPDLOG_ERROR("{}, {}",pItemAward->dwID,command); + if (!(strcmp(command, "GIFT"))) // command 가 GIFT이면 { TPacketItemAwardInfromer giftData; - strcpy(giftData.login, kData->szLogin); //로그인 아이디 복사 - strcpy(giftData.command, command); //명령어 복사 - giftData.vnum = kData->dwVnum; //아이템 vnum도 복사 - CClientManager::instance().ForwardPacket(HEADER_DG_ITEMAWARD_INFORMER,&giftData,sizeof(TPacketItemAwardInfromer)); + strcpy(giftData.login, kData->szLogin); // 로그인 아이디 복사 + strcpy(giftData.command, command); // 명령어 복사 + giftData.vnum = kData->dwVnum; // 아이템 vnum도 복사 + CClientManager::instance().ForwardPacket(HEADER_DG_ITEMAWARD_INFORMER, &giftData, sizeof(TPacketItemAwardInfromer)); } } @@ -75,7 +73,7 @@ void ItemAwardManager::Load(SQLMsg * pMsg) printf("ITEM_AWARD load id %u bMall %d \n", kData->dwID, kData->bMall); SPDLOG_DEBUG("ITEM_AWARD: load id {} login {} vnum {} count {} socket {}", kData->dwID, kData->szLogin, kData->dwVnum, kData->dwCount, kData->dwSocket0); - std::set & kSet = m_map_kSetAwardByLogin[kData->szLogin]; + std::set &kSet = m_map_kSetAwardByLogin[kData->szLogin]; kSet.insert(kData); if (dwID > g_dwLastCachedItemAwardID) @@ -83,7 +81,7 @@ void ItemAwardManager::Load(SQLMsg * pMsg) } } -std::set * ItemAwardManager::GetByLogin(const char * c_pszLogin) +std::set *ItemAwardManager::GetByLogin(const char *c_pszLogin) { itertype(m_map_kSetAwardByLogin) it = m_map_kSetAwardByLogin.find(c_pszLogin); @@ -103,27 +101,27 @@ void ItemAwardManager::Taken(DWORD dwAwardID, DWORD dwItemID) return; } - TItemAward * k = it->second; + TItemAward *k = it->second; k->bTaken = true; // // Update taken_time in database to prevent not to give him again. - // + // char szQuery[QUERY_MAX_LEN]; - snprintf(szQuery, sizeof(szQuery), - "UPDATE item_award SET taken_time=NOW(),item_id=%u WHERE id=%u AND taken_time IS NULL", - dwItemID, dwAwardID); + snprintf(szQuery, sizeof(szQuery), + "UPDATE item_award SET taken_time=NOW(),item_id=%u WHERE id=%u AND taken_time IS NULL", + dwItemID, dwAwardID); CDBManager::instance().ReturnQuery(szQuery, QID_ITEM_AWARD_TAKEN, 0, NULL); } -std::map& ItemAwardManager::GetMapAward() +std::map &ItemAwardManager::GetMapAward() { return m_map_award; } -std::map >& ItemAwardManager::GetMapkSetAwardByLogin() +std::map> &ItemAwardManager::GetMapkSetAwardByLogin() { return m_map_kSetAwardByLogin; } \ No newline at end of file diff --git a/src/db/src/ItemAwardManager.h b/src/db/src/ItemAwardManager.h index db6e42d..48ea335 100644 --- a/src/db/src/ItemAwardManager.h +++ b/src/db/src/ItemAwardManager.h @@ -7,37 +7,38 @@ typedef struct SItemAward { - DWORD dwID; - char szLogin[LOGIN_MAX_LEN+1]; - DWORD dwVnum; - DWORD dwCount; - DWORD dwSocket0; - DWORD dwSocket1; - DWORD dwSocket2; - char szWhy[ITEM_AWARD_WHY_MAX_LEN+1]; - bool bTaken; - bool bMall; + DWORD dwID; + char szLogin[LOGIN_MAX_LEN + 1]; + DWORD dwVnum; + DWORD dwCount; + DWORD dwSocket0; + DWORD dwSocket1; + DWORD dwSocket2; + char szWhy[ITEM_AWARD_WHY_MAX_LEN + 1]; + bool bTaken; + bool bMall; } TItemAward; class ItemAwardManager : public singleton { - public: +public: ItemAwardManager(); virtual ~ItemAwardManager(); - void RequestLoad(); - void Load(SQLMsg * pMsg); - std::set * GetByLogin(const char * c_pszLogin); + void RequestLoad(); + void Load(SQLMsg *pMsg); + std::set *GetByLogin(const char *c_pszLogin); - void Taken(DWORD dwAwardID, DWORD dwItemID); + void Taken(DWORD dwAwardID, DWORD dwItemID); // gift notify - std::map& GetMapAward(); - std::map >& GetMapkSetAwardByLogin(); - private: + std::map &GetMapAward(); + std::map> &GetMapkSetAwardByLogin(); + +private: // ID, ItemAward pair - std::map m_map_award; + std::map m_map_award; // PID, ItemAward pair - std::map > m_map_kSetAwardByLogin; + std::map> m_map_kSetAwardByLogin; }; #endif diff --git a/src/db/src/ItemIDRangeManager.cpp b/src/db/src/ItemIDRangeManager.cpp index f4cf045..8e05f2d 100644 --- a/src/db/src/ItemIDRangeManager.cpp +++ b/src/db/src/ItemIDRangeManager.cpp @@ -16,7 +16,7 @@ void CItemIDRangeManager::Build() DWORD dwMax = 0; TItemIDRangeTable range; - for (int i = 0; ; ++i) + for (int i = 0;; ++i) { dwMin = cs_dwMinimumRange * (i + 1) + 1; dwMax = cs_dwMinimumRange * (i + 2); @@ -48,7 +48,7 @@ struct FCheckCollision range = data; } - void operator() (CPeer* peer) + void operator()(CPeer *peer) { if (hasCollision == false) { @@ -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; } } @@ -84,11 +85,11 @@ TItemIDRangeTable CItemIDRangeManager::GetRange() return ret; } -bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable& range) +bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable &range) { char szQuery[1024]; DWORD dwItemMaxID = 0; - SQLMsg* pMsg = NULL; + 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); @@ -109,11 +110,11 @@ bool CItemIDRangeManager::BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable dwItemMaxID = dwMin; else dwItemMaxID++; - + if ((dwMax < dwItemMaxID) || (dwMax - dwItemMaxID < cs_dwMinimumRemainCount)) { SPDLOG_DEBUG("ItemIDRange: Build {} ~ {} start: {}\tNOT USE remain count is below {}", - dwMin, dwMax, dwItemMaxID, cs_dwMinimumRemainCount); + dwMin, dwMax, dwItemMaxID, cs_dwMinimumRemainCount); } else { @@ -121,8 +122,8 @@ 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", - GetTablePostfix(), range.dwUsableItemIDMin, range.dwMax); + snprintf(szQuery, sizeof(szQuery), "SELECT COUNT(*) FROM item%s WHERE id >= %u AND id <= %u", + GetTablePostfix(), range.dwUsableItemIDMin, range.dwMax); pMsg = CDBManager::instance().DirectQuery(szQuery); @@ -162,4 +163,3 @@ void CItemIDRangeManager::UpdateRange(DWORD dwMin, DWORD dwMax) m_listData.push_back(range); } } - diff --git a/src/db/src/ItemIDRangeManager.h b/src/db/src/ItemIDRangeManager.h index 5ab5506..6a8f2b7 100644 --- a/src/db/src/ItemIDRangeManager.h +++ b/src/db/src/ItemIDRangeManager.h @@ -2,25 +2,26 @@ #ifndef __INC_METIN_II_ITEM_ID_RANGE_MANAGER_H__ #define __INC_METIN_II_ITEM_ID_RANGE_MANAGER_H__ -namespace { - static const uint32_t cs_dwMaxItemID = 4290000000UL; - static const uint32_t cs_dwMinimumRange = 10000000UL; - static const uint32_t cs_dwMinimumRemainCount = 10000UL; +namespace +{ + static const uint32_t cs_dwMaxItemID = 4290000000UL; + static const uint32_t cs_dwMinimumRange = 10000000UL; + static const uint32_t cs_dwMinimumRemainCount = 10000UL; } class CItemIDRangeManager : public singleton { - private: - std::list m_listData; +private: + std::list m_listData; - public: - CItemIDRangeManager(); +public: + CItemIDRangeManager(); - void Build(); - bool BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable& range); - void UpdateRange(DWORD dwMin, DWORD dwMax); + void Build(); + bool BuildRange(DWORD dwMin, DWORD dwMax, TItemIDRangeTable &range); + void UpdateRange(DWORD dwMin, DWORD dwMax); - TItemIDRangeTable GetRange(); + TItemIDRangeTable GetRange(); }; #endif diff --git a/src/db/src/Lock.h b/src/db/src/Lock.h index 0e1e7d1..90a2ec1 100644 --- a/src/db/src/Lock.h +++ b/src/db/src/Lock.h @@ -2,22 +2,22 @@ #ifndef __INC_LOCK_H__ #define __INC_LOCK_H__ -typedef pthread_mutex_t lock_t; +typedef pthread_mutex_t lock_t; class CLock { - public: +public: CLock(); ~CLock(); - void Initialize(); - void Destroy(); - int Trylock(); - void Lock(); - void Unlock(); + void Initialize(); + void Destroy(); + int Trylock(); + void Lock(); + void Unlock(); - private: - lock_t m_lock; - bool m_bLocked; +private: + lock_t m_lock; + bool m_bLocked; }; #endif diff --git a/src/db/src/LoginData.cpp b/src/db/src/LoginData.cpp index 5ef328c..5f5d48c 100644 --- a/src/db/src/LoginData.cpp +++ b/src/db/src/LoginData.cpp @@ -17,17 +17,17 @@ CLoginData::CLoginData() memset(&m_data, 0, sizeof(TAccountTable)); } -TAccountTable & CLoginData::GetAccountRef() +TAccountTable &CLoginData::GetAccountRef() { return m_data; } -void CLoginData::SetClientKey(const DWORD * c_pdwClientKey) +void CLoginData::SetClientKey(const DWORD *c_pdwClientKey) { memcpy(&m_adwClientKey, c_pdwClientKey, sizeof(DWORD) * 4); } -const DWORD * CLoginData::GetClientKey() +const DWORD *CLoginData::GetClientKey() { return &m_adwClientKey[0]; } @@ -62,12 +62,12 @@ DWORD CLoginData::GetLogonTime() return m_dwLogonTime; } -void CLoginData::SetIP(const char * c_pszIP) +void CLoginData::SetIP(const char *c_pszIP) { strlcpy(m_szIP, c_pszIP, sizeof(m_szIP)); } -const char * CLoginData::GetIP() +const char *CLoginData::GetIP() { return m_szIP; } @@ -101,7 +101,7 @@ bool CLoginData::IsDeleted() return m_bDeleted; } -void CLoginData::SetPremium(DWORD * paiPremiumTimes) +void CLoginData::SetPremium(DWORD *paiPremiumTimes) { memcpy(m_aiPremiumTimes, paiPremiumTimes, sizeof(m_aiPremiumTimes)); } @@ -114,8 +114,7 @@ DWORD CLoginData::GetPremium(BYTE type) return m_aiPremiumTimes[type]; } -DWORD * CLoginData::GetPremiumPtr() +DWORD *CLoginData::GetPremiumPtr() { return &m_aiPremiumTimes[0]; } - diff --git a/src/db/src/LoginData.h b/src/db/src/LoginData.h index debd493..d4ef351 100644 --- a/src/db/src/LoginData.h +++ b/src/db/src/LoginData.h @@ -4,55 +4,55 @@ class CLoginData { - public: +public: CLoginData(); - TAccountTable & GetAccountRef(); - void SetClientKey(const DWORD * c_pdwClientKey); + TAccountTable &GetAccountRef(); + void SetClientKey(const DWORD *c_pdwClientKey); - const DWORD * GetClientKey(); - void SetKey(DWORD dwKey); - DWORD GetKey(); + const DWORD *GetClientKey(); + void SetKey(DWORD dwKey); + DWORD GetKey(); - void SetConnectedPeerHandle(DWORD dwHandle); - DWORD GetConnectedPeerHandle(); + void SetConnectedPeerHandle(DWORD dwHandle); + DWORD GetConnectedPeerHandle(); - void SetLogonTime(); - DWORD GetLogonTime(); + void SetLogonTime(); + DWORD GetLogonTime(); - void SetIP(const char * c_pszIP); - const char * GetIP(); + void SetIP(const char *c_pszIP); + const char *GetIP(); - void SetPlay(bool bOn); - bool IsPlay(); + void SetPlay(bool bOn); + bool IsPlay(); - void SetDeleted(bool bSet); - bool IsDeleted(); + void SetDeleted(bool bSet); + bool IsDeleted(); - time_t GetLastPlayTime() { return m_lastPlayTime; } + time_t GetLastPlayTime() { return m_lastPlayTime; } - void SetPremium(DWORD * paiPremiumTimes); - DWORD GetPremium(BYTE type); - DWORD * GetPremiumPtr(); + void SetPremium(DWORD *paiPremiumTimes); + DWORD GetPremium(BYTE type); + DWORD *GetPremiumPtr(); - DWORD GetLastPlayerID() const { return m_dwLastPlayerID; } - void SetLastPlayerID(DWORD id) { m_dwLastPlayerID = id; } + DWORD GetLastPlayerID() const { return m_dwLastPlayerID; } + void SetLastPlayerID(DWORD id) { m_dwLastPlayerID = id; } - private: - DWORD m_dwKey; - DWORD m_adwClientKey[4]; - DWORD m_dwConnectedPeerHandle; - DWORD m_dwLogonTime; - char m_szIP[MAX_HOST_LENGTH+1]; - bool m_bPlay; - bool m_bDeleted; +private: + DWORD m_dwKey; + DWORD m_adwClientKey[4]; + DWORD m_dwConnectedPeerHandle; + DWORD m_dwLogonTime; + char m_szIP[MAX_HOST_LENGTH + 1]; + bool m_bPlay; + bool m_bDeleted; - time_t m_lastPlayTime; - DWORD m_aiPremiumTimes[PREMIUM_MAX_NUM]; + time_t m_lastPlayTime; + DWORD m_aiPremiumTimes[PREMIUM_MAX_NUM]; - DWORD m_dwLastPlayerID; + DWORD m_dwLastPlayerID; - TAccountTable m_data; + TAccountTable m_data; }; #endif diff --git a/src/db/src/Main.cpp b/src/db/src/Main.cpp index 9c1bee1..d75f176 100644 --- a/src/db/src/Main.cpp +++ b/src/db/src/Main.cpp @@ -10,35 +10,33 @@ #include "Marriage.h" #include "Monarch.h" #include "ItemIDRangeManager.h" +#ifndef __INTELLISENSE__ #include +#else +#include <../../../common/version.h> +#endif #include -void SetTablePostfix(const char* c_pszTablePostfix); +void SetTablePostfix(const char *c_pszTablePostfix); int Start(); std::string g_stTablePostfix; std::string g_stLocaleNameColumn = "name"; std::string g_stLocale = "euckr"; - BOOL g_test_server = false; -//단위 초 -int g_iPlayerCacheFlushSeconds = 60*7; -int g_iItemCacheFlushSeconds = 60*5; - -//g_iLogoutSeconds 수치는 g_iPlayerCacheFlushSeconds 와 g_iItemCacheFlushSeconds 보다 길어야 한다. -int g_iLogoutSeconds = 60*10; +// 단위 초 +int g_iPlayerCacheFlushSeconds = 60 * 7; +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) @@ -53,14 +51,10 @@ void emergency_sig(int sig) int main() { WriteVersion(); - log_init(); - -#ifdef __FreeBSD__ - _malloc_options = "A"; -#endif + log_init(); CConfig Config; - CDBManager DBManager; + CDBManager DBManager; CClientManager ClientManager; CGuildManager GuildManager; CPrivManager PrivManager; @@ -82,30 +76,32 @@ int main() signal_timer_disable(); DBManager.Quit(); - int iCount; - while (true) - { - iCount = 0; + // TODO Check if this is really needed, this should just be cleaning up queued queries + // int iCount; - iCount += CDBManager::instance().CountReturnQuery(SQL_PLAYER); - iCount += CDBManager::instance().CountAsyncQuery(SQL_PLAYER); + // while (true) + // { + // iCount = 0; - if (iCount == 0) - break; + // iCount += CDBManager::instance().CountReturnQuery(SQL_PLAYER); + // iCount += CDBManager::instance().CountAsyncQuery(SQL_PLAYER); - usleep(1000); - SPDLOG_DEBUG("WAITING_QUERY_COUNT {}", iCount); - } + // if (iCount == 0) + // break; - log_destroy(); + // usleep(1000); + // SPDLOG_DEBUG("WAITING_QUERY_COUNT {}", iCount); + // } + + log_destroy(); return 1; } void emptybeat(LPHEART heart, int pulse) { - if (!(pulse % heart->passes_per_sec)) // 1초에 한번 + if (!(pulse % heart->passes_per_sec)) // 1초에 한번 { } } @@ -126,7 +122,7 @@ int Start() SPDLOG_INFO("Real Server"); } else - SPDLOG_INFO("Test Server"); + SPDLOG_INFO("Test Server"); int tmpValue; @@ -139,7 +135,7 @@ int Start() if (CConfig::instance().GetValue("LOG_LEVEL", &tmpValue)) { - SPDLOG_INFO("Setting log level to {}", tmpValue); + SPDLOG_INFO("Setting log level to {}", tmpValue); tmpValue = std::clamp(tmpValue, SPDLOG_LEVEL_TRACE, SPDLOG_LEVEL_OFF); log_set_level(tmpValue); } @@ -147,7 +143,7 @@ int Start() thecore_init(heart_beat, emptybeat); signal_timer_enable(60); - char szBuf[256+1]; + char szBuf[256 + 1]; if (CConfig::instance().GetValue("LOCALE", szBuf, 256)) { @@ -172,20 +168,21 @@ int Start() if (CConfig::instance().GetValue("ITEM_CACHE_FLUSH_SECONDS", szBuf, 256)) { str_to_number(g_iItemCacheFlushSeconds, szBuf); - SPDLOG_INFO("ITEM_CACHE_FLUSH_SECONDS: {}", g_iItemCacheFlushSeconds); + SPDLOG_INFO("ITEM_CACHE_FLUSH_SECONDS: {}", g_iItemCacheFlushSeconds); } // MYSHOP_PRICE_LIST - if (CConfig::instance().GetValue("ITEM_PRICELIST_CACHE_FLUSH_SECONDS", szBuf, 256)) + if (CConfig::instance().GetValue("ITEM_PRICELIST_CACHE_FLUSH_SECONDS", szBuf, 256)) { str_to_number(g_iItemPriceListTableCacheFlushSeconds, szBuf); - SPDLOG_INFO("ITEM_PRICELIST_CACHE_FLUSH_SECONDS: {}", g_iItemPriceListTableCacheFlushSeconds); + SPDLOG_INFO("ITEM_PRICELIST_CACHE_FLUSH_SECONDS: {}", g_iItemPriceListTableCacheFlushSeconds); } // END_OF_MYSHOP_PRICE_LIST // 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); } @@ -206,75 +203,33 @@ int Start() char szAddr[64], szDB[64], szUser[64], szPassword[64]; int iPort; - char line[256+1]; + 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)"); + sscanf(line, " %s %s %s %s %d ", szAddr, szDB, szUser, szPassword, &iPort); + SPDLOG_DEBUG("Connecting to PostgreSQL server"); - if (!CDBManager::instance().Connect(SQL_PLAYER, 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"); + if (!CDBManager::instance().Connect(szAddr, iPort, szDB, szUser, szPassword)) + { + SPDLOG_CRITICAL("Connection to PostgreSQL server failed!"); 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"); - return false; - } - - if (CConfig::instance().GetValue("SQL_COMMON", line, 256)) - { - 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; - } + SPDLOG_INFO("Connected to PostgreSQL server"); if (!CClientManager::instance().Initialize()) { - SPDLOG_ERROR("ClientManager initialization failed"); + SPDLOG_ERROR("ClientManager initialization failed"); return false; } - SPDLOG_INFO("ClientManager initialization OK"); + SPDLOG_INFO("ClientManager initialization OK"); signal(SIGUSR1, emergency_sig); signal(SIGSEGV, emergency_sig); return true; } -void SetTablePostfix(const char* c_pszTablePostfix) +void SetTablePostfix(const char *c_pszTablePostfix) { if (!c_pszTablePostfix || !*c_pszTablePostfix) g_stTablePostfix = ""; @@ -282,7 +237,7 @@ void SetTablePostfix(const char* c_pszTablePostfix) g_stTablePostfix = c_pszTablePostfix; } -const char * GetTablePostfix() +const char *GetTablePostfix() { return g_stTablePostfix.c_str(); } diff --git a/src/db/src/Main.h b/src/db/src/Main.h index 8d489b4..f390a2d 100644 --- a/src/db/src/Main.h +++ b/src/db/src/Main.h @@ -1,9 +1,7 @@ #ifndef __INC_MAIN_H__ #define __INC_MAIN_H__ -int Start(); -void End(); -const char * GetTablePostfix(); -const char * GetPlayerDBName(); +int Start(); +const char *GetTablePostfix(); #endif diff --git a/src/db/src/Marriage.cpp b/src/db/src/Marriage.cpp index b7e3a4e..e1d0716 100644 --- a/src/db/src/Marriage.cpp +++ b/src/db/src/Marriage.cpp @@ -7,17 +7,17 @@ namespace marriage { const DWORD WEDDING_LENGTH = 60 * 60; // sec - bool operator < (const TWedding& lhs, const TWedding& rhs) + bool operator<(const TWedding &lhs, const TWedding &rhs) { return lhs.dwTime < rhs.dwTime; } - bool operator > (const TWedding& lhs, const TWedding& rhs) + bool operator>(const TWedding &lhs, const TWedding &rhs) { return lhs.dwTime > rhs.dwTime; } - bool operator > (const TWeddingInfo &lhs, const TWeddingInfo& rhs) + bool operator>(const TWeddingInfo &lhs, const TWeddingInfo &rhs) { return lhs.dwTime > rhs.dwTime; } @@ -37,13 +37,13 @@ namespace marriage char szQuery[1024]; snprintf(szQuery, sizeof(szQuery), - "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()); + "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 pmsg_delete(CDBManager::instance().DirectQuery("DELETE FROM marriage WHERE is_married = 0")); unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult * pRes = pmsg->Get(); + SQLResult *pRes = pmsg->Get(); SPDLOG_DEBUG("MarriageList(size={})", pRes->uiNumRows); if (pRes->uiNumRows > 0) @@ -52,15 +52,20 @@ namespace marriage { MYSQL_ROW row = mysql_fetch_row(pRes->pSQLResult); - DWORD pid1 = 0; str_to_number(pid1, row[0]); - DWORD pid2 = 0; str_to_number(pid2, row[1]); - int love_point = 0; str_to_number(love_point, row[2]); - DWORD time = 0; str_to_number(time, row[3]); - BYTE is_married = 0; str_to_number(is_married, row[4]); - const char* name1 = row[5]; - const char* name2 = row[6]; + DWORD pid1 = 0; + str_to_number(pid1, row[0]); + DWORD pid2 = 0; + str_to_number(pid2, row[1]); + int love_point = 0; + str_to_number(love_point, row[2]); + DWORD time = 0; + str_to_number(time, row[3]); + BYTE is_married = 0; + str_to_number(is_married, row[4]); + const char *name1 = row[5]; + const char *name2 = row[6]; - TMarriage* pMarriage = new TMarriage(pid1, pid2, love_point, time, is_married, name1, name2); + TMarriage *pMarriage = new TMarriage(pid1, pid2, love_point, time, is_married, name1, name2); m_Marriages.insert(pMarriage); m_MarriageByPID.insert(make_pair(pid1, pMarriage)); m_MarriageByPID.insert(make_pair(pid2, pMarriage)); @@ -71,7 +76,7 @@ namespace marriage return true; } - TMarriage* CManager::Get(DWORD dwPlayerID) + TMarriage *CManager::Get(DWORD dwPlayerID) { itertype(m_MarriageByPID) it = m_MarriageByPID.find(dwPlayerID); @@ -81,13 +86,13 @@ namespace marriage return NULL; } - void Align(DWORD& rPID1, DWORD& rPID2) + void Align(DWORD &rPID1, DWORD &rPID2) { if (rPID1 > rPID2) std::swap(rPID1, rPID2); } - void CManager::Add(DWORD dwPID1, DWORD dwPID2, const char* szName1, const char* szName2) + void CManager::Add(DWORD dwPID1, DWORD dwPID2, const char *szName1, const char *szName2) { DWORD now = CClientManager::instance().GetCurrentTime(); if (IsMarried(dwPID1) || IsMarried(dwPID2)) @@ -103,7 +108,7 @@ namespace marriage unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult* res = pmsg->Get(); + SQLResult *res = pmsg->Get(); if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1) { SPDLOG_ERROR("cannot insert marriage"); @@ -112,7 +117,7 @@ namespace marriage SPDLOG_DEBUG("MARRIAGE ADD {} {}", dwPID1, dwPID2); - TMarriage* pMarriage = new TMarriage(dwPID1, dwPID2, 0, now, 0, szName1, szName2); + TMarriage *pMarriage = new TMarriage(dwPID1, dwPID2, 0, now, 0, szName1, szName2); m_Marriages.insert(pMarriage); m_MarriageByPID.insert(make_pair(dwPID1, pMarriage)); m_MarriageByPID.insert(make_pair(dwPID2, pMarriage)); @@ -128,7 +133,7 @@ namespace marriage void CManager::Update(DWORD dwPID1, DWORD dwPID2, INT iLovePoint, BYTE byMarried) { - TMarriage* pMarriage = Get(dwPID1); + TMarriage *pMarriage = Get(dwPID1); if (!pMarriage || pMarriage->GetOther(dwPID1) != dwPID2) { SPDLOG_ERROR("not under marriage : {} {}", dwPID1, dwPID2); @@ -138,12 +143,12 @@ namespace marriage Align(dwPID1, dwPID2); char szQuery[512]; - snprintf(szQuery, sizeof(szQuery), "UPDATE marriage SET love_point = %d, is_married = %d WHERE pid1 = %u AND pid2 = %u", - iLovePoint, byMarried, pMarriage->pid1, pMarriage->pid2); + snprintf(szQuery, sizeof(szQuery), "UPDATE marriage SET love_point = %d, is_married = %d WHERE pid1 = %u AND pid2 = %u", + iLovePoint, byMarried, pMarriage->pid1, pMarriage->pid2); unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult* res = pmsg->Get(); + SQLResult *res = pmsg->Get(); if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1) { SPDLOG_ERROR("cannot update marriage : PID:{} {}", dwPID1, dwPID2); @@ -164,7 +169,7 @@ namespace marriage void CManager::Remove(DWORD dwPID1, DWORD dwPID2) { - TMarriage* pMarriage = Get(dwPID1); + TMarriage *pMarriage = Get(dwPID1); if (pMarriage) { @@ -189,7 +194,7 @@ namespace marriage unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult* res = pmsg->Get(); + SQLResult *res = pmsg->Get(); if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1) { SPDLOG_ERROR("cannot delete marriage : PID:{} {}", dwPID1, dwPID2); @@ -212,7 +217,7 @@ namespace marriage void CManager::EngageToMarriage(DWORD dwPID1, DWORD dwPID2) { - TMarriage* pMarriage = Get(dwPID1); + TMarriage *pMarriage = Get(dwPID1); if (!pMarriage || pMarriage->GetOther(dwPID1) != dwPID2) { SPDLOG_ERROR("not under marriage : PID:{} {}", dwPID1, dwPID2); @@ -228,12 +233,12 @@ namespace marriage Align(dwPID1, dwPID2); char szQuery[512]; - snprintf(szQuery, sizeof(szQuery), "UPDATE marriage SET is_married = 1 WHERE pid1 = %u AND pid2 = %u", - pMarriage->pid1, pMarriage->pid2); + snprintf(szQuery, sizeof(szQuery), "UPDATE marriage SET is_married = 1 WHERE pid1 = %u AND pid2 = %u", + pMarriage->pid1, pMarriage->pid2); unique_ptr pmsg(CDBManager::instance().DirectQuery(szQuery)); - SQLResult* res = pmsg->Get(); + SQLResult *res = pmsg->Get(); if (res->uiAffectedRows == 0 || res->uiAffectedRows == (uint32_t)-1) { SPDLOG_ERROR("cannot change engage to marriage : PID:{} {}", dwPID1, dwPID2); @@ -251,12 +256,12 @@ namespace marriage CClientManager::instance().ForwardPacket(HEADER_DG_MARRIAGE_UPDATE, &p, sizeof(p)); } - void CManager::OnSetup(CPeer* peer) + void CManager::OnSetup(CPeer *peer) { // 결혼한 사람들 보내기 for (itertype(m_Marriages) it = m_Marriages.begin(); it != m_Marriages.end(); ++it) { - TMarriage* pMarriage = *it; + TMarriage *pMarriage = *it; { TPacketMarriageAdd p; @@ -274,7 +279,7 @@ namespace marriage p.dwPID1 = pMarriage->pid1; p.dwPID2 = pMarriage->pid2; p.iLovePoint = pMarriage->love_point; - p.byMarried = pMarriage->is_married; + p.byMarried = pMarriage->is_married; peer->EncodeHeader(HEADER_DG_MARRIAGE_UPDATE, 0, sizeof(p)); peer->Encode(&p, sizeof(p)); } @@ -283,7 +288,7 @@ namespace marriage // 결혼식 보내기 for (itertype(m_mapRunningWedding) it = m_mapRunningWedding.begin(); it != m_mapRunningWedding.end(); ++it) { - const TWedding& t = it->second; + const TWedding &t = it->second; TPacketWeddingReady p; p.dwPID1 = t.dwPID1; @@ -317,7 +322,7 @@ namespace marriage return; } - TWedding& w = it->second; + TWedding &w = it->second; TPacketWeddingEnd p; p.dwPID1 = w.dwPID1; @@ -341,7 +346,7 @@ namespace marriage if (it == m_mapRunningWedding.end()) continue; - TWedding& w = it->second; + TWedding &w = it->second; TPacketWeddingEnd p; p.dwPID1 = w.dwPID1; @@ -353,7 +358,7 @@ namespace marriage if (it_marriage != m_MarriageByPID.end()) { - TMarriage* pMarriage = it_marriage->second; + TMarriage *pMarriage = it_marriage->second; if (!pMarriage->is_married) { Remove(pMarriage->pid1, pMarriage->pid2); diff --git a/src/db/src/Marriage.h b/src/db/src/Marriage.h index 149df9e..ede61a7 100644 --- a/src/db/src/Marriage.h +++ b/src/db/src/Marriage.h @@ -17,8 +17,8 @@ namespace marriage DWORD dwPID2; TWeddingInfo(DWORD time, DWORD pid1, DWORD pid2) : dwTime(time), - dwPID1(pid1), - dwPID2(pid2) + dwPID1(pid1), + dwPID2(pid2) { } }; @@ -32,28 +32,28 @@ namespace marriage TWedding(DWORD time, DWORD dwMapIndex, DWORD pid1, DWORD pid2) : dwTime(time), - dwMapIndex(dwMapIndex), - dwPID1(pid1), - dwPID2(pid2) + dwMapIndex(dwMapIndex), + dwPID1(pid1), + dwPID2(pid2) { } }; - extern bool operator < (const TWedding& lhs, const TWedding& rhs); - extern bool operator > (const TWedding& lhs, const TWedding& rhs); - extern bool operator > (const TWeddingInfo& lhs, const TWeddingInfo& rhs); + extern bool operator<(const TWedding &lhs, const TWedding &rhs); + extern bool operator>(const TWedding &lhs, const TWedding &rhs); + extern bool operator>(const TWeddingInfo &lhs, const TWeddingInfo &rhs); struct TMarriage { DWORD pid1; DWORD pid2; - int love_point; + int love_point; DWORD time; BYTE is_married; // false : 약혼 상태, true : 결혼 상태 std::string name1; std::string name2; - TMarriage(DWORD _pid1, DWORD _pid2, int _love_point, DWORD _time, BYTE _is_married, const char* name1, const char* name2) + TMarriage(DWORD _pid1, DWORD _pid2, int _love_point, DWORD _time, BYTE _is_married, const char *name1, const char *name2) : pid1(_pid1), pid2(_pid2), love_point(_love_point), time(_time), is_married(_is_married), name1(name1), name2(name2) { } @@ -72,41 +72,41 @@ namespace marriage class CManager : public singleton { - public: - CManager(); - virtual ~CManager(); + public: + CManager(); + virtual ~CManager(); - bool Initialize(); + bool Initialize(); - TMarriage* Get(DWORD dwPlayerID); - bool IsMarried(DWORD dwPlayerID) - { - return Get(dwPlayerID) != NULL; - } + TMarriage *Get(DWORD dwPlayerID); + bool IsMarried(DWORD dwPlayerID) + { + return Get(dwPlayerID) != NULL; + } - //void Reserve(DWORD dwPID1, DWORD dwPID2); - void Add(DWORD dwPID1, DWORD dwPID2, const char* szName1, const char* szName2); - void Remove(DWORD dwPID1, DWORD dwPID2); - void Update(DWORD dwPID1, DWORD dwPID2, INT iLovePoint, BYTE byMarried); + // void Reserve(DWORD dwPID1, DWORD dwPID2); + void Add(DWORD dwPID1, DWORD dwPID2, const char *szName1, const char *szName2); + void Remove(DWORD dwPID1, DWORD dwPID2); + void Update(DWORD dwPID1, DWORD dwPID2, INT iLovePoint, BYTE byMarried); - void EngageToMarriage(DWORD dwPID1, DWORD dwPID2); + void EngageToMarriage(DWORD dwPID1, DWORD dwPID2); - void ReadyWedding(DWORD dwMapIndex, DWORD dwPID1, DWORD dwPID2); - void EndWedding(DWORD dwPID1, DWORD dwPID2); + void ReadyWedding(DWORD dwMapIndex, DWORD dwPID1, DWORD dwPID2); + void EndWedding(DWORD dwPID1, DWORD dwPID2); - void OnSetup(CPeer* peer); + void OnSetup(CPeer *peer); - void Update(); + void Update(); - private: - std::set m_Marriages; - std::map m_MarriageByPID; + private: + std::set m_Marriages; + std::map m_MarriageByPID; - std::priority_queue, std::greater > m_pqWeddingStart; + std::priority_queue, std::greater> m_pqWeddingStart; - std::priority_queue, std::greater > m_pqWeddingEnd; + std::priority_queue, std::greater> m_pqWeddingEnd; - std::map, TWedding> m_mapRunningWedding; + std::map, TWedding> m_mapRunningWedding; }; } diff --git a/src/db/src/Monarch.cpp b/src/db/src/Monarch.cpp index 5fe7ba5..5fecbb5 100644 --- a/src/db/src/Monarch.cpp +++ b/src/db/src/Monarch.cpp @@ -22,17 +22,15 @@ bool CMonarch::VoteMonarch(DWORD pid, DWORD selectdpid) if (it == m_map_MonarchElection.end()) { - MonarchElectionInfo * p = new MonarchElectionInfo; + MonarchElectionInfo *p = new MonarchElectionInfo; p->pid = pid; - p->selectedpid= selectdpid; + p->selectedpid = selectdpid; m_map_MonarchElection.insert(MAP_MONARCHELECTION::value_type(pid, p)); - char szQuery[256]; - snprintf(szQuery, sizeof(szQuery), - "INSERT INTO monarch_election(pid, selectedpid, electiondata) VALUES(%d, %d, now())", pid, selectdpid); - - CDBManager::instance().AsyncQuery(szQuery); - return 1; + CDBManager::instance().AsyncQuery( + "INSERT INTO player.monarch_election(player_id, selected_player_id, election_at) VALUES($1, $2, now())", + pqxx::params(pid, selectdpid)); + return 1; } return 0; @@ -42,15 +40,15 @@ void CMonarch::ElectMonarch() { int size = GetVecMonarchCandidacy().size(); - int * s = new int[size]; + int *s = new int[size]; itertype(m_map_MonarchElection) it = m_map_MonarchElection.begin(); int idx = 0; - for (; it != m_map_MonarchElection.end(); ++it) + for (; it != m_map_MonarchElection.end(); ++it) { - if ((idx = GetCandidacyIndex(it->second->pid)) < 0) + if ((idx = GetCandidacyIndex(it->second->pid)) < 0) continue; ++s[idx]; @@ -58,23 +56,23 @@ void CMonarch::ElectMonarch() SPDLOG_TRACE("[MONARCH_VOTE] pid({}) come to vote candidacy pid({})", it->second->pid, m_vec_MonarchCandidacy[idx].pid); } - delete [] s; + delete[] s; } bool CMonarch::IsCandidacy(DWORD pid) { VEC_MONARCHCANDIDACY::iterator it = m_vec_MonarchCandidacy.begin(); - + for (; it != m_vec_MonarchCandidacy.end(); ++it) { if (it->pid == pid) return false; } - + return true; } -bool CMonarch::AddCandidacy(DWORD pid, const char * name) +bool CMonarch::AddCandidacy(DWORD pid, const char *name) { if (IsCandidacy(pid) == false) return false; @@ -83,34 +81,33 @@ bool CMonarch::AddCandidacy(DWORD pid, const char * name) info.pid = pid; strlcpy(info.name, name, sizeof(info.name)); - m_vec_MonarchCandidacy.push_back(info); + m_vec_MonarchCandidacy.push_back(info); - char szQuery[256]; - snprintf(szQuery, sizeof(szQuery), - "INSERT INTO monarch_candidacy(pid, date) VALUES(%d, now())", pid); + CDBManager::instance().AsyncQuery( + "INSERT INTO player.monarch_candidacy(player_id, date) VALUES($1, now())", + pqxx::params(pid)); - CDBManager::instance().AsyncQuery(szQuery); return true; } -bool CMonarch::DelCandidacy(const char * name) +bool CMonarch::DelCandidacy(const char *name) { itertype(m_vec_MonarchCandidacy) it = m_vec_MonarchCandidacy.begin(); for (; it != m_vec_MonarchCandidacy.end(); ++it) { if (0 == strncmp(it->name, name, sizeof(it->name))) { - char szQuery[256]; - snprintf(szQuery, sizeof(szQuery), - "DELETE FROM monarch_candidacy WHERE pid=%d ", it->pid); - CDBManager::instance().AsyncQuery(szQuery); - - m_vec_MonarchCandidacy.erase (it); + CDBManager::instance().AsyncQuery( + "DELETE FROM player.monarch_candidacy WHERE player_id=$1", + pqxx::params(it->pid)); + + m_vec_MonarchCandidacy.erase(it); + return true; } } - return false; + return false; } bool CMonarch::IsMonarch(int Empire, DWORD pid) @@ -129,26 +126,25 @@ bool CMonarch::AddMoney(int Empire, int64_t Money) int64_t Money64 = m_MonarchInfo.money[Empire]; - char szQuery[1024]; - snprintf(szQuery, sizeof(szQuery), "UPDATE monarch set money=%ld where empire=%d", Money64, Empire); - - CDBManager::instance().AsyncQuery(szQuery); + CDBManager::instance().AsyncQuery( + "UPDATE player.monarch SET money=$1 WHERE empire=$2", + pqxx::params(Money64, Empire)); return true; } bool CMonarch::DecMoney(int Empire, int64_t Money) { - if (m_MonarchInfo.money[Empire] - Money < 0) + if (m_MonarchInfo.money[Empire] - Money < 0) return false; m_MonarchInfo.money[Empire] -= Money; int64_t Money64 = m_MonarchInfo.money[Empire]; - char szQuery[1024]; - snprintf(szQuery, sizeof(szQuery), "UPDATE monarch set money=%ld where empire=%d", Money64, Empire); + CDBManager::instance().AsyncQuery( + "UPDATE player.monarch SET money=$1 WHERE empire=$2", + pqxx::params(Money64, Empire)); - CDBManager::instance().AsyncQuery(szQuery); return true; } @@ -159,14 +155,12 @@ bool CMonarch::TakeMoney(int Empire, DWORD pid, int64_t Money) if (m_MonarchInfo.money[Empire] < Money) return false; - + m_MonarchInfo.money[Empire] -= Money; - char szQuery[1024]; - snprintf(szQuery, sizeof(szQuery), - "UPDATE monarch set money=%ld; where empire=%d", m_MonarchInfo.money[Empire], Empire); - - CDBManager::instance().AsyncQuery(szQuery); + CDBManager::instance().AsyncQuery( + "UPDATE player.monarch SET money=$1 WHERE empire=$2", + pqxx::params(m_MonarchInfo.money[Empire], Empire)); SPDLOG_TRACE("[MONARCH] Take money empire({}) money({})", Empire, m_MonarchInfo.money[Empire]); return true; @@ -174,122 +168,153 @@ 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); + MonarchInfo *p = &m_MonarchInfo; - if (pMsg->Get()->uiNumRows == 0) - { - delete pMsg; - return false; - } + auto pool = CDBManager::instance().GetConnectionPool(); + auto conn = pool->acquire(); - MYSQL_ROW row; - for (int n = 0; (row = mysql_fetch_row(pMsg->Get()->pSQLResult)) != NULL; ++n) - { - int idx = 0; - int Empire = 0; str_to_number(Empire, row[idx++]); + 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); - str_to_number(p->pid[Empire], row[idx++]); - strlcpy(p->name[Empire], row[idx++], sizeof(p->name[Empire])); + if (numRows == 0) + { + return false; + } - str_to_number(p->money[Empire], row[idx++]); - strlcpy(p->date[Empire], row[idx++], sizeof(p->date[Empire])); + for (auto row : result) + { + int Empire = row[0].as(); + str_to_number(p->pid[Empire], row[1].c_str()); + strlcpy(p->name[Empire], row[2].c_str(), sizeof(p->name[Empire])); - SPDLOG_TRACE("[LOAD_MONARCH] Empire {} pid {} money {} windate {}", Empire, p->pid[Empire], p->money[Empire], p->date[Empire]); - } + str_to_number(p->money[Empire], row[3].c_str()); + strlcpy(p->date[Empire], row[4].c_str(), sizeof(p->date[Empire])); - delete pMsg; - return true; + SPDLOG_TRACE("[LOAD_MONARCH] Empire {} pid {} money {} windate {}", Empire, p->pid[Empire], p->money[Empire], p->date[Empire]); + } + + 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) +bool CMonarch::SetMonarch(const char *name) { - MonarchInfo * p = &m_MonarchInfo; - char szQuery[256]; + MonarchInfo *p = &m_MonarchInfo; - snprintf(szQuery, sizeof(szQuery), "SELECT empire, pid, name FROM player a where a.name = '%s'", name); - SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER); + auto pool = CDBManager::instance().GetConnectionPool(); + auto conn = pool->acquire(); - if (pMsg->Get()->uiNumRows == 0) - { - delete pMsg; - return false; - } + 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); - MYSQL_ROW row; - int Empire = 0; - for (int n = 0; (row = mysql_fetch_row(pMsg->Get()->pSQLResult)) != NULL; ++n) - { - int idx = 0; - str_to_number(Empire, row[idx++]); + if (numRows == 0) + { + return false; + } - str_to_number(p->pid[Empire], row[idx++]); - strlcpy(p->name[Empire], row[idx++], sizeof(p->name[Empire])); - p->money[Empire] = atoll(row[idx++]); - - SPDLOG_TRACE("[Set_MONARCH] Empire {} pid {} money {} windate {}", Empire, p->pid[Empire], p->money[Empire], p->date[Empire]); - } - delete pMsg; + int Empire = 0; + for (auto row : result) + { + Empire = row[0].as(); - //db에 입력 - snprintf(szQuery, sizeof(szQuery), - "REPLACE INTO monarch (empire, name, windate, money) VALUES(%d, %d, now(), %ld)", Empire, p->pid[Empire], p->money[Empire]); + str_to_number(p->pid[Empire], row[1].c_str()); + strlcpy(p->name[Empire], row[2].c_str(), sizeof(p->name[Empire])); + p->money[Empire] = atoll(row[3].c_str()); - CDBManager::instance().AsyncQuery(szQuery, SQL_PLAYER); - return true; + SPDLOG_TRACE("[Set_MONARCH] Empire {} pid {} money {} windate {}", Empire, p->pid[Empire], p->money[Empire], p->date[Empire]); + } + + txn.commit(); + + 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; + } + + 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); - SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER); - - if (pMsg->Get()->uiNumRows == 0) + try { - delete pMsg; + pqxx::work txn{*conn}; + 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) + { + return false; + } + } + catch (const std::exception &e) + { + SPDLOG_ERROR("[CMonarch::DelMonarch] Query error: {}", e.what()); return false; } - delete pMsg; - 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) +bool CMonarch::DelMonarch(const char *name) { - for (int n = 1; n < 4; ++n) + auto pool = CDBManager::instance().GetConnectionPool(); + auto conn = pool->acquire(); + + try { - if (0 == strncmp(m_MonarchInfo.name[n], name, sizeof(m_MonarchInfo.name[n]))) + pqxx::work txn{*conn}; + pqxx::result result = txn.exec_params("DELETE FROM player.monarch WHERE name=$1 RETURNING empire", name); + std::size_t const numRows = std::size(result); + + if (numRows == 0) { - char szQuery[256]; + return false; + } - int Empire = n; - snprintf(szQuery, sizeof(szQuery), "DELETE from monarch where name=%d", Empire); - SQLMsg * pMsg = CDBManager::instance().DirectQuery(szQuery, SQL_PLAYER); + for (auto row : result) + { + int Empire = row[0].as(); - if (pMsg->Get()->uiNumRows == 0) - { - SPDLOG_ERROR(" DirectQuery failed({})", szQuery); - delete pMsg; - return false; - } - - delete pMsg; - - 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; } } - + catch (const std::exception &e) + { + SPDLOG_ERROR("[CMonarch::DelMonarch(name)] Query error: {}", e.what()); + return false; + } + return false; } @@ -300,7 +325,7 @@ int CMonarch::GetCandidacyIndex(DWORD pid) for (int n = 0; it != m_vec_MonarchCandidacy.end(); ++it, ++n) { if (it->pid == pid) - return n; + return n; } return -1; diff --git a/src/db/src/Monarch.h b/src/db/src/Monarch.h index 06560c3..4db13dc 100644 --- a/src/db/src/Monarch.h +++ b/src/db/src/Monarch.h @@ -10,61 +10,61 @@ class CMonarch : public singleton { - public: - typedef std::map MAP_MONARCHELECTION; - typedef std::vector VEC_MONARCHCANDIDACY; +public: + typedef std::map MAP_MONARCHELECTION; + typedef std::vector VEC_MONARCHCANDIDACY; - CMonarch(); - virtual ~CMonarch(); + CMonarch(); + virtual ~CMonarch(); - bool VoteMonarch(DWORD pid, DWORD selectedpid); - void ElectMonarch(); + bool VoteMonarch(DWORD pid, DWORD selectedpid); + void ElectMonarch(); - bool IsCandidacy(DWORD pid); - bool AddCandidacy(DWORD pid, const char * name); - bool DelCandidacy(const char * name); + bool IsCandidacy(DWORD pid); + bool AddCandidacy(DWORD pid, const char *name); + bool DelCandidacy(const char *name); - bool LoadMonarch(); - bool SetMonarch(const char * name); - bool DelMonarch(int Empire); - bool DelMonarch(const char * name); + bool LoadMonarch(); + bool SetMonarch(const char *name); + bool DelMonarch(int Empire); + bool DelMonarch(const char *name); - bool IsMonarch(int Empire, DWORD pid); - bool AddMoney(int Empire, int64_t Money); - bool DecMoney(int Empire, int64_t Money); - bool TakeMoney(int Empire, DWORD pid, int64_t Money); + bool IsMonarch(int Empire, DWORD pid); + bool AddMoney(int Empire, int64_t Money); + bool DecMoney(int Empire, int64_t Money); + bool TakeMoney(int Empire, DWORD pid, int64_t Money); - TMonarchInfo* GetMonarch() - { - return &m_MonarchInfo; - } + TMonarchInfo *GetMonarch() + { + return &m_MonarchInfo; + } - VEC_MONARCHCANDIDACY& GetVecMonarchCandidacy() - { - return m_vec_MonarchCandidacy; - } + VEC_MONARCHCANDIDACY &GetVecMonarchCandidacy() + { + return m_vec_MonarchCandidacy; + } - size_t MonarchCandidacySize() - { - return m_vec_MonarchCandidacy.size(); - } + size_t MonarchCandidacySize() + { + return m_vec_MonarchCandidacy.size(); + } - private: - int GetCandidacyIndex(DWORD pid); +private: + int GetCandidacyIndex(DWORD pid); - MAP_MONARCHELECTION m_map_MonarchElection; - VEC_MONARCHCANDIDACY m_vec_MonarchCandidacy; - TMonarchInfo m_MonarchInfo; + MAP_MONARCHELECTION m_map_MonarchElection; + VEC_MONARCHCANDIDACY m_vec_MonarchCandidacy; + TMonarchInfo m_MonarchInfo; - MonarchElectionInfo* GetMonarchElection(DWORD pid) - { - MAP_MONARCHELECTION::iterator it = m_map_MonarchElection.find(pid); + MonarchElectionInfo *GetMonarchElection(DWORD pid) + { + MAP_MONARCHELECTION::iterator it = m_map_MonarchElection.find(pid); - if (it != m_map_MonarchElection.end()) - return it->second; + if (it != m_map_MonarchElection.end()) + return it->second; - return NULL; - } + return NULL; + } }; #endif diff --git a/src/db/src/MoneyLog.cpp b/src/db/src/MoneyLog.cpp index 8f5dd09..d38b7ed 100644 --- a/src/db/src/MoneyLog.cpp +++ b/src/db/src/MoneyLog.cpp @@ -13,15 +13,15 @@ CMoneyLog::~CMoneyLog() void CMoneyLog::Save() { - CPeer* peer = CClientManager::instance().GetAnyPeer(); + CPeer *peer = CClientManager::instance().GetAnyPeer(); if (!peer) return; - for (BYTE bType = 0; bType < MONEY_LOG_TYPE_MAX_NUM; bType ++) + for (BYTE bType = 0; bType < MONEY_LOG_TYPE_MAX_NUM; bType++) { typeof(m_MoneyLogContainer[bType].begin()) it; for (it = m_MoneyLogContainer[bType].begin(); it != m_MoneyLogContainer[bType].end(); ++it) { - //bType; + // bType; TPacketMoneyLog p; p.type = bType; p.vnum = it->first; @@ -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) diff --git a/src/db/src/MoneyLog.h b/src/db/src/MoneyLog.h index 76e316c..939b6c4 100644 --- a/src/db/src/MoneyLog.h +++ b/src/db/src/MoneyLog.h @@ -6,14 +6,14 @@ class CMoneyLog : public singleton { - public: +public: CMoneyLog(); virtual ~CMoneyLog(); void Save(); void AddLog(BYTE bType, DWORD dwVnum, int iGold); - private: +private: std::map m_MoneyLogContainer[MONEY_LOG_TYPE_MAX_NUM]; }; diff --git a/src/db/src/Peer.cpp b/src/db/src/Peer.cpp index bcbe2cc..0ad8b7c 100644 --- a/src/db/src/Peer.cpp +++ b/src/db/src/Peer.cpp @@ -61,48 +61,50 @@ void CPeer::SetUserCount(DWORD dwCount) m_dwUserCount = dwCount; } -bool CPeer::PeekPacket(int & iBytesProceed, BYTE & header, DWORD & dwHandle, DWORD & dwLength, const char ** data) +bool CPeer::PeekPacket(int &iBytesProceed, BYTE &header, DWORD &dwHandle, DWORD &dwLength, const char **data) { - // Return if not enough data was received to read the header + // Return if not enough data was received to read the header if (GetRecvLength() < iBytesProceed + 9) return false; - const char * buf = (const char *) GetRecvBuffer(iBytesProceed + 9); - if (!buf) { - SPDLOG_ERROR("PeekPacket: Failed to get network buffer!"); - return false; - } - - buf += iBytesProceed; - - // Read the header data - header = *(buf++); - - dwHandle = *((DWORD *) buf); - buf += sizeof(DWORD); - - dwLength = *((DWORD *) buf); - buf += sizeof(DWORD); - - // Ensure that all the data was fully received - if (iBytesProceed + dwLength + 9 > (DWORD) GetRecvLength()) + const char *buf = (const char *)GetRecvBuffer(iBytesProceed + 9); + if (!buf) { - SPDLOG_DEBUG("PeekPacket: not enough buffer size: len {}, recv {}", - 9+dwLength, GetRecvLength()-iBytesProceed); + SPDLOG_ERROR("PeekPacket: Failed to get network buffer!"); return false; } - // Ensure that all the required data is available in a contiguous area - buf = (const char *) GetRecvBuffer(iBytesProceed + dwLength + 9); - if (!buf) { - SPDLOG_ERROR("PeekPacket: Failed to get network buffer!"); - return false; - } + buf += iBytesProceed; - // Skip the header - buf += iBytesProceed + 9; + // Read the header data + header = *(buf++); - // Set the data pointer + dwHandle = *((DWORD *)buf); + buf += sizeof(DWORD); + + dwLength = *((DWORD *)buf); + buf += sizeof(DWORD); + + // Ensure that all the data was fully received + if (iBytesProceed + dwLength + 9 > (DWORD)GetRecvLength()) + { + SPDLOG_DEBUG("PeekPacket: not enough buffer size: len {}, recv {}", + 9 + dwLength, GetRecvLength() - iBytesProceed); + return false; + } + + // Ensure that all the required data is available in a contiguous area + buf = (const char *)GetRecvBuffer(iBytesProceed + dwLength + 9); + if (!buf) + { + SPDLOG_ERROR("PeekPacket: Failed to get network buffer!"); + return false; + } + + // Skip the header + buf += iBytesProceed + 9; + + // Set the data pointer *data = buf; iBytesProceed += dwLength + 9; return true; @@ -131,7 +133,7 @@ void CPeer::SetP2PPort(WORD wPort) m_wP2PPort = wPort; } -void CPeer::SetMaps(LONG * pl) +void CPeer::SetMaps(LONG *pl) { memcpy(m_alMaps, pl, sizeof(m_alMaps)); } @@ -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,11 +173,12 @@ 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, - m_itemSpareRange.dwUsableItemIDMin); + m_itemSpareRange.dwUsableItemIDMin); return true; } @@ -184,18 +188,16 @@ bool CPeer::CheckItemIDRangeCollision(TItemIDRangeTable itemRange) if (m_itemRange.dwMin < itemRange.dwMax && m_itemRange.dwMax > itemRange.dwMin) { SPDLOG_ERROR("ItemIDRange: Collision!! this {} ~ {} check {} ~ {}", - m_itemRange.dwMin, m_itemRange.dwMax, itemRange.dwMin, itemRange.dwMax); + m_itemRange.dwMin, m_itemRange.dwMax, itemRange.dwMin, itemRange.dwMax); return false; } if (m_itemSpareRange.dwMin < itemRange.dwMax && m_itemSpareRange.dwMax > itemRange.dwMin) { SPDLOG_ERROR("ItemIDRange: Collision with spare range this {} ~ {} check {} ~ {}", - m_itemSpareRange.dwMin, m_itemSpareRange.dwMax, itemRange.dwMin, itemRange.dwMax); + m_itemSpareRange.dwMin, m_itemSpareRange.dwMax, itemRange.dwMin, itemRange.dwMax); return false; } - + return true; } - - diff --git a/src/db/src/Peer.h b/src/db/src/Peer.h index 9c3da0b..1fc4043 100644 --- a/src/db/src/Peer.h +++ b/src/db/src/Peer.h @@ -6,70 +6,70 @@ class CPeer : public CPeerBase { - protected: +protected: virtual void OnAccept(); virtual void OnClose(); - public: +public: #pragma pack(1) typedef struct _header - { - BYTE bHeader; - DWORD dwHandle; - DWORD dwSize; + { + BYTE bHeader; + DWORD dwHandle; + DWORD dwSize; } HEADER; #pragma pack() enum EState { - STATE_CLOSE = 0, - STATE_PLAYING = 1 + STATE_CLOSE = 0, + STATE_PLAYING = 1 }; CPeer(); virtual ~CPeer(); - void EncodeHeader(BYTE header, DWORD dwHandle, DWORD dwSize); - bool PeekPacket(int & iBytesProceed, BYTE & header, DWORD & dwHandle, DWORD & dwLength, const char ** data); - void EncodeReturn(BYTE header, DWORD dwHandle); + void EncodeHeader(BYTE header, DWORD dwHandle, DWORD dwSize); + bool PeekPacket(int &iBytesProceed, BYTE &header, DWORD &dwHandle, DWORD &dwLength, const char **data); + void EncodeReturn(BYTE header, DWORD dwHandle); - void ProcessInput(); + void ProcessInput(); - DWORD GetHandle(); - DWORD GetUserCount(); - void SetUserCount(DWORD dwCount); + DWORD GetHandle(); + DWORD GetUserCount(); + void SetUserCount(DWORD dwCount); - void SetChannel(BYTE bChannel) { m_bChannel = bChannel; } - BYTE GetChannel() { return m_bChannel; } + void SetChannel(BYTE bChannel) { m_bChannel = bChannel; } + BYTE GetChannel() { return m_bChannel; } - void SetPublicIP(const char * ip) { m_stPublicIP = ip; } - const char * GetPublicIP() { return m_stPublicIP.c_str(); } + void SetPublicIP(const char *ip) { m_stPublicIP = ip; } + const char *GetPublicIP() { return m_stPublicIP.c_str(); } - void SetListenPort(WORD wPort) { m_wListenPort = wPort; } - WORD GetListenPort() { return m_wListenPort; } + void SetListenPort(WORD wPort) { m_wListenPort = wPort; } + WORD GetListenPort() { return m_wListenPort; } - void SetInternalIP(const char * ip) { m_stInternalIP = ip; } - const char * GetInternalIP() { return m_stInternalIP.c_str(); } + void SetInternalIP(const char *ip) { m_stInternalIP = ip; } + const char *GetInternalIP() { return m_stInternalIP.c_str(); } - void SetP2PPort(WORD wPort); - WORD GetP2PPort() { return m_wP2PPort; } + void SetP2PPort(WORD wPort); + WORD GetP2PPort() { return m_wP2PPort; } - void SetMaps(LONG* pl); - LONG * GetMaps() { return &m_alMaps[0]; } + void SetMaps(LONG *pl); + LONG *GetMaps() { return &m_alMaps[0]; } - bool SetItemIDRange(TItemIDRangeTable itemRange); - bool SetSpareItemIDRange(TItemIDRangeTable itemRange); - bool CheckItemIDRangeCollision(TItemIDRangeTable itemRange); - void SendSpareItemIDRange(); + bool SetItemIDRange(TItemIDRangeTable itemRange); + bool SetSpareItemIDRange(TItemIDRangeTable itemRange); + bool CheckItemIDRangeCollision(TItemIDRangeTable itemRange); + void SendSpareItemIDRange(); - private: - int m_state; +private: + int m_state; - BYTE m_bChannel; - DWORD m_dwHandle; - DWORD m_dwUserCount; - WORD m_wListenPort; // 게임서버가 클라이언트를 위해 listen 하는 포트 - WORD m_wP2PPort; // 게임서버가 게임서버 P2P 접속을 위해 listen 하는 포트 - LONG m_alMaps[MAP_ALLOW_MAX_LEN]; // 어떤 맵을 관장하고 있는가? + BYTE m_bChannel; + DWORD m_dwHandle; + DWORD m_dwUserCount; + WORD m_wListenPort; // 게임서버가 클라이언트를 위해 listen 하는 포트 + WORD m_wP2PPort; // 게임서버가 게임서버 P2P 접속을 위해 listen 하는 포트 + LONG m_alMaps[MAP_ALLOW_MAX_LEN]; // 어떤 맵을 관장하고 있는가? TItemIDRangeTable m_itemRange; TItemIDRangeTable m_itemSpareRange; diff --git a/src/db/src/PeerBase.cpp b/src/db/src/PeerBase.cpp index 7335f74..3ccf50d 100644 --- a/src/db/src/PeerBase.cpp +++ b/src/db/src/PeerBase.cpp @@ -9,25 +9,28 @@ CPeerBase::CPeerBase() : m_bufferevent(nullptr) CPeerBase::~CPeerBase() { - Destroy(); + Destroy(); } void CPeerBase::Destroy() { - if (m_bufferevent) { + if (m_bufferevent) + { bufferevent_free(m_bufferevent); m_bufferevent = nullptr; } } -bool CPeerBase::Accept(bufferevent* bufev, sockaddr* addr) +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; } @@ -36,40 +39,41 @@ bool CPeerBase::Accept(bufferevent* bufev, sockaddr* addr) m_bufferevent = bufev; // Get the address of the conected peer - sockaddr_in* peer; - sockaddr_in6* peer6; + sockaddr_in *peer; + sockaddr_in6 *peer6; - switch (addr->sa_family) { - case AF_INET: - peer = (sockaddr_in*) addr; - inet_ntop(AF_INET, &(peer->sin_addr), m_host, INET_ADDRSTRLEN); - break; + switch (addr->sa_family) + { + case AF_INET: + peer = (sockaddr_in *)addr; + inet_ntop(AF_INET, &(peer->sin_addr), m_host, INET_ADDRSTRLEN); + break; - case AF_INET6: - peer6 = (sockaddr_in6*) addr; - inet_ntop(AF_INET, &(peer6->sin6_addr), m_host, INET6_ADDRSTRLEN); - break; + case AF_INET6: + peer6 = (sockaddr_in6 *)addr; + inet_ntop(AF_INET, &(peer6->sin6_addr), m_host, INET6_ADDRSTRLEN); + break; - default: - break; + default: + break; } // Trigger the OnAccept event - OnAccept(); + OnAccept(); - SPDLOG_DEBUG("ACCEPT FROM {}", m_host); + SPDLOG_DEBUG("ACCEPT FROM {}", m_host); - return true; + return true; } void CPeerBase::Close() { - OnClose(); + OnClose(); } void CPeerBase::EncodeBYTE(BYTE b) { - Encode(&b, sizeof(b)); + Encode(&b, sizeof(b)); } void CPeerBase::EncodeWORD(WORD w) @@ -82,15 +86,16 @@ void CPeerBase::EncodeDWORD(DWORD dw) Encode(&dw, sizeof(dw)); } -void CPeerBase::Encode(const void* data, size_t size) +void CPeerBase::Encode(const void *data, size_t size) { - if (!m_bufferevent) - { - SPDLOG_ERROR("Bufferevent not ready!"); - return; - } + if (!m_bufferevent) + { + SPDLOG_ERROR("Bufferevent not ready!"); + return; + } - if (bufferevent_write(m_bufferevent, data, size) != 0) { + if (bufferevent_write(m_bufferevent, data, size) != 0) + { SPDLOG_ERROR("Buffer write error!"); return; } @@ -117,10 +122,10 @@ size_t CPeerBase::GetRecvLength() } evbuffer *input = bufferevent_get_input(m_bufferevent); - return evbuffer_get_length(input); + return evbuffer_get_length(input); } -const void * CPeerBase::GetRecvBuffer(ssize_t ensure_bytes) +const void *CPeerBase::GetRecvBuffer(ssize_t ensure_bytes) { if (!m_bufferevent) { @@ -129,7 +134,7 @@ const void * CPeerBase::GetRecvBuffer(ssize_t ensure_bytes) } evbuffer *input = bufferevent_get_input(m_bufferevent); - return evbuffer_pullup(input, ensure_bytes); + return evbuffer_pullup(input, ensure_bytes); } size_t CPeerBase::GetSendLength() diff --git a/src/db/src/PeerBase.h b/src/db/src/PeerBase.h index 92c3ca2..009e63e 100644 --- a/src/db/src/PeerBase.h +++ b/src/db/src/PeerBase.h @@ -3,38 +3,39 @@ #include -class CPeerBase { +class CPeerBase +{ protected: - virtual void OnAccept() = 0; - virtual void OnClose() = 0; + virtual void OnAccept() = 0; + virtual void OnClose() = 0; public: - bool Accept(bufferevent* bufev, sockaddr* addr); - void Close(); + bool Accept(bufferevent *bufev, sockaddr *addr); + void Close(); public: CPeerBase(); virtual ~CPeerBase(); - void Destroy(); + void Destroy(); - bufferevent * GetBufferevent() { return m_bufferevent; } + bufferevent *GetBufferevent() { return m_bufferevent; } - void EncodeBYTE(BYTE b); - void EncodeWORD(WORD w); - void EncodeDWORD(DWORD dw); - void Encode(const void* data, size_t size); - void RecvEnd(size_t proceed_bytes); - size_t GetRecvLength(); - const void * GetRecvBuffer(ssize_t ensure_bytes); + void EncodeBYTE(BYTE b); + void EncodeWORD(WORD w); + void EncodeDWORD(DWORD dw); + void Encode(const void *data, size_t size); + void RecvEnd(size_t proceed_bytes); + size_t GetRecvLength(); + const void *GetRecvBuffer(ssize_t ensure_bytes); - size_t GetSendLength(); + size_t GetSendLength(); - const char * GetHost() { return m_host; } + const char *GetHost() { return m_host; } protected: - char m_host[IP_ADDRESS_LENGTH + 1]; - bufferevent * m_bufferevent; + char m_host[IP_ADDRESS_LENGTH + 1]; + bufferevent *m_bufferevent; }; #endif diff --git a/src/db/src/PrivManager.cpp b/src/db/src/PrivManager.cpp index ab1cb94..f579278 100644 --- a/src/db/src/PrivManager.cpp +++ b/src/db/src/PrivManager.cpp @@ -2,9 +2,9 @@ #include "PrivManager.h" #include "ClientManager.h" -const int PRIV_DURATION = 60*60*12; -const int CHARACTER_GOOD_PRIV_DURATION = 2*60*60; -const int CHARACTER_BAD_PRIV_DURATION = 60*60; +const int PRIV_DURATION = 60 * 60 * 12; +const int CHARACTER_GOOD_PRIV_DURATION = 2 * 60 * 60; +const int CHARACTER_BAD_PRIV_DURATION = 60 * 60; CPrivManager::CPrivManager() { @@ -28,7 +28,7 @@ void CPrivManager::Update() while (!m_pqPrivGuild.empty() && m_pqPrivGuild.top().first <= now) { - TPrivGuildData* p = m_pqPrivGuild.top().second; + TPrivGuildData *p = m_pqPrivGuild.top().second; m_pqPrivGuild.pop(); if (p->value != 0 && !p->bRemoved) @@ -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 @@ -51,7 +52,7 @@ void CPrivManager::Update() while (!m_pqPrivEmpire.empty() && m_pqPrivEmpire.top().first <= now) { - TPrivEmpireData* p = (m_pqPrivEmpire.top().second); + TPrivEmpireData *p = (m_pqPrivEmpire.top().second); m_pqPrivEmpire.pop(); if (p->value != 0 && !p->bRemoved) @@ -65,7 +66,7 @@ void CPrivManager::Update() while (!m_pqPrivChar.empty() && m_pqPrivChar.top().first <= now) { - TPrivCharData* p = (m_pqPrivChar.top().second); + TPrivCharData *p = (m_pqPrivChar.top().second); m_pqPrivChar.pop(); if (!p->bRemoved) @@ -97,14 +98,14 @@ void CPrivManager::AddCharPriv(DWORD pid, BYTE type, int value) return; time_t now = CClientManager::instance().GetCurrentTime(); - TPrivCharData* p = new TPrivCharData(type, value, pid); + TPrivCharData *p = new TPrivCharData(type, value, pid); int iDuration = CHARACTER_BAD_PRIV_DURATION; if (value > 0) iDuration = CHARACTER_GOOD_PRIV_DURATION; - m_pqPrivChar.push(std::make_pair(now+iDuration, p)); + m_pqPrivChar.push(std::make_pair(now + iDuration, p)); m_aPrivChar[type].insert(std::make_pair(pid, p)); // TODO send packet @@ -127,7 +128,7 @@ void CPrivManager::AddGuildPriv(DWORD guild_id, BYTE type, int value, time_t dur time_t now = CClientManager::instance().GetCurrentTime(); time_t end = now + duration_sec; - TPrivGuildData * p = new TPrivGuildData(type, value, guild_id, end); + TPrivGuildData *p = new TPrivGuildData(type, value, guild_id, end); m_pqPrivGuild.push(std::make_pair(end, p)); // ADD_GUILD_PRIV_TIME @@ -156,7 +157,7 @@ void CPrivManager::AddEmpirePriv(BYTE empire, BYTE type, int value, time_t durat duration_sec = 0; time_t now = CClientManager::instance().GetCurrentTime(); - time_t end = now+duration_sec; + time_t end = now + duration_sec; // 이전 설정값 무효화 // priority_queue에 들어있는 pointer == m_aaPrivEmpire[type][empire] @@ -165,7 +166,7 @@ void CPrivManager::AddEmpirePriv(BYTE empire, BYTE type, int value, time_t durat m_aaPrivEmpire[type][empire]->bRemoved = true; } - TPrivEmpireData * p = new TPrivEmpireData(type, value, empire, end); + TPrivEmpireData *p = new TPrivEmpireData(type, value, empire, end); m_pqPrivEmpire.push(std::make_pair(end, p)); m_aaPrivEmpire[type][empire] = p; @@ -192,7 +193,7 @@ struct FSendChangeGuildPriv // END_OF_ADD_GUILD_PRIV_TIME } - void operator() (CPeer* peer) + void operator()(CPeer *peer) { peer->EncodeHeader(HEADER_DG_CHANGE_GUILD_PRIV, 0, sizeof(TPacketDGChangeGuildPriv)); peer->Encode(&p, sizeof(TPacketDGChangeGuildPriv)); @@ -215,7 +216,7 @@ struct FSendChangeEmpirePriv // END_OF_ADD_EMPIRE_PRIV_TIME } - void operator ()(CPeer* peer) + void operator()(CPeer *peer) { peer->EncodeHeader(HEADER_DG_CHANGE_EMPIRE_PRIV, 0, sizeof(TPacketDGChangeEmpirePriv)); peer->Encode(&p, sizeof(TPacketDGChangeEmpirePriv)); @@ -234,7 +235,7 @@ struct FSendChangeCharPriv p.value = value; p.bLog = 1; } - void operator()(CPeer* peer) + void operator()(CPeer *peer) { peer->EncodeHeader(HEADER_DG_CHANGE_CHARACTER_PRIV, 0, sizeof(TPacketDGChangeCharacterPriv)); peer->Encode(&p, sizeof(TPacketDGChangeCharacterPriv)); @@ -262,14 +263,14 @@ void CPrivManager::SendChangeCharPriv(DWORD pid, BYTE type, int value) CClientManager::instance().for_each_peer(FSendChangeCharPriv(pid, type, value)); } -void CPrivManager::SendPrivOnSetup(CPeer* peer) +void CPrivManager::SendPrivOnSetup(CPeer *peer) { for (int i = 1; i < MAX_PRIV_NUM; ++i) { for (int e = 0; e < EMPIRE_MAX_NUM; ++e) { // ADD_EMPIRE_PRIV_TIME - TPrivEmpireData* pPrivEmpireData = m_aaPrivEmpire[i][e]; + TPrivEmpireData *pPrivEmpireData = m_aaPrivEmpire[i][e]; if (pPrivEmpireData) { FSendChangeEmpirePriv(e, i, pPrivEmpireData->value, pPrivEmpireData->end_time_sec)(peer); @@ -277,7 +278,7 @@ void CPrivManager::SendPrivOnSetup(CPeer* peer) // END_OF_ADD_EMPIRE_PRIV_TIME } - for (typeof(m_aPrivGuild[i].begin()) it = m_aPrivGuild[i].begin(); it != m_aPrivGuild[i].end();++it) + for (typeof(m_aPrivGuild[i].begin()) it = m_aPrivGuild[i].begin(); it != m_aPrivGuild[i].end(); ++it) { // ADD_GUILD_PRIV_TIME FSendChangeGuildPriv(it->first, i, it->second->value, it->second->end_time_sec)(peer); diff --git a/src/db/src/PrivManager.h b/src/db/src/PrivManager.h index 95eb367..5a03c4d 100644 --- a/src/db/src/PrivManager.h +++ b/src/db/src/PrivManager.h @@ -8,17 +8,18 @@ struct TPrivEmpireData { - BYTE type; - int value; - bool bRemoved; - BYTE empire; + BYTE type; + int value; + bool bRemoved; + BYTE empire; // ADD_EMPIRE_PRIV_TIME - time_t end_time_sec; + time_t end_time_sec; - 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) - {} + 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 }; @@ -27,29 +28,31 @@ struct TPrivEmpireData */ struct TPrivGuildData { - BYTE type; - int value; - bool bRemoved; - DWORD guild_id; + BYTE type; + int value; + bool bRemoved; + DWORD guild_id; // ADD_GUILD_PRIV_TIME - time_t end_time_sec; ///< 지속시간 + time_t end_time_sec; ///< 지속시간 - 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 ) - {} + 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 }; struct TPrivCharData { - BYTE type; - int value; - bool bRemoved; - DWORD pid; - TPrivCharData(BYTE type, int value, DWORD pid) - : type(type), value(value), bRemoved(false), pid(pid) - {} + BYTE type; + int value; + bool bRemoved; + DWORD pid; + TPrivCharData(BYTE type, int value, DWORD pid) + : type(type), value(value), bRemoved(false), pid(pid) + { + } }; /** @@ -57,7 +60,7 @@ struct TPrivCharData */ class CPrivManager : public singleton { - public: +public: CPrivManager(); virtual ~CPrivManager(); @@ -65,42 +68,41 @@ class CPrivManager : public singleton void AddGuildPriv(DWORD guild_id, BYTE type, int value, time_t time_sec); // END_OF_ADD_GUILD_PRIV_TIME - // ADD_EMPIRE_PRIV_TIME + // ADD_EMPIRE_PRIV_TIME void AddEmpirePriv(BYTE empire, BYTE type, int value, time_t time_sec); // END_OF_ADD_EMPIRE_PRIV_TIME - + void AddCharPriv(DWORD pid, BYTE type, int value); void Update(); - void SendPrivOnSetup(CPeer* peer); - - private: + 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 - // ADD_EMPIRE_PRIV_TIME + // ADD_EMPIRE_PRIV_TIME void SendChangeEmpirePriv(BYTE empire, BYTE type, int value, time_t end_time_sec); // END_OF_ADD_EMPIRE_PRIV_TIME void SendChangeCharPriv(DWORD pid, BYTE type, int value); typedef std::pair stPairChar; - typedef std::pair stPairGuild; - typedef std::pair stPairEmpire; + typedef std::pair stPairGuild; + typedef std::pair stPairEmpire; - std::priority_queue, std::greater > - m_pqPrivChar; - std::priority_queue, std::greater > - m_pqPrivGuild; - std::priority_queue, std::greater > - m_pqPrivEmpire; + std::priority_queue, std::greater> + m_pqPrivChar; + std::priority_queue, std::greater> + m_pqPrivGuild; + std::priority_queue, std::greater> + m_pqPrivEmpire; - TPrivEmpireData* m_aaPrivEmpire[MAX_PRIV_NUM][EMPIRE_MAX_NUM]; - std::map m_aPrivGuild[MAX_PRIV_NUM]; - std::map m_aPrivChar[MAX_PRIV_NUM]; + TPrivEmpireData *m_aaPrivEmpire[MAX_PRIV_NUM][EMPIRE_MAX_NUM]; + std::map m_aPrivGuild[MAX_PRIV_NUM]; + std::map m_aPrivChar[MAX_PRIV_NUM]; }; #endif diff --git a/src/db/src/ProtoReader.cpp b/src/db/src/ProtoReader.cpp index f38a8f2..88e7c8b 100644 --- a/src/db/src/ProtoReader.cpp +++ b/src/db/src/ProtoReader.cpp @@ -9,177 +9,177 @@ using namespace std; -inline string trim_left(const string& str) +inline string trim_left(const string &str) { - string::size_type n = str.find_first_not_of(" \t\v\n\r"); - return n == string::npos ? str : str.substr(n, str.length()); + string::size_type n = str.find_first_not_of(" \t\v\n\r"); + return n == string::npos ? str : str.substr(n, str.length()); } -inline string trim_right(const string& str) +inline string trim_right(const string &str) { - string::size_type n = str.find_last_not_of(" \t\v\n\r"); - return n == string::npos ? str : str.substr(0, n + 1); + string::size_type n = str.find_last_not_of(" \t\v\n\r"); + return n == string::npos ? str : str.substr(0, n + 1); } -string trim(const string& str){return trim_left(trim_right(str));} +string trim(const string &str) { return trim_left(trim_right(str)); } -static string* StringSplit(string strOrigin, string strTok) +static string *StringSplit(string strOrigin, string strTok) { - int cutAt; //자르는위치 - int index = 0; //문자열인덱스 - string* strResult = new string[30]; //결과return 할변수 + int cutAt; // 자르는위치 + int index = 0; // 문자열인덱스 + string *strResult = new string[30]; // 결과return 할변수 - //strTok을찾을때까지반복 - while ((cutAt = strOrigin.find_first_of(strTok)) != strOrigin.npos) - { - if (cutAt > 0) //자르는위치가0보다크면(성공시) - { - strResult[index++] = strOrigin.substr(0, cutAt); //결과배열에추가 - } - strOrigin = strOrigin.substr(cutAt+1); //원본은자른부분제외한나머지 - } + // strTok을찾을때까지반복 + while ((cutAt = strOrigin.find_first_of(strTok)) != strOrigin.npos) + { + if (cutAt > 0) // 자르는위치가0보다크면(성공시) + { + strResult[index++] = strOrigin.substr(0, cutAt); // 결과배열에추가 + } + strOrigin = strOrigin.substr(cutAt + 1); // 원본은자른부분제외한나머지 + } - if(strOrigin.length() > 0) //원본이아직남았으면 - { - strResult[index++] = strOrigin.substr(0, cutAt); //나머지를결과배열에추가 - } + if (strOrigin.length() > 0) // 원본이아직남았으면 + { + strResult[index++] = strOrigin.substr(0, cutAt); // 나머지를결과배열에추가 + } - for( int i=0;i "; - for (int j=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) { - //cout << j << " "; - retInt = j; + if (inputString.find(tempString) != string::npos && tempString.find(inputString) != string::npos) + { + // cout << j << " "; + retInt = j; break; } } - //cout << endl; + // cout << endl; return retInt; - } -int get_Item_SubType_Value(int type_value, string inputString) +int get_Item_SubType_Value(int type_value, string inputString) { - static string arSub1[] = { "WEAPON_SWORD", "WEAPON_DAGGER", "WEAPON_BOW", "WEAPON_TWO_HANDED", - "WEAPON_BELL", "WEAPON_FAN", "WEAPON_ARROW", "WEAPON_MOUNT_SPEAR"}; - static string arSub2[] = { "ARMOR_BODY", "ARMOR_HEAD", "ARMOR_SHIELD", "ARMOR_WRIST", "ARMOR_FOOTS", - "ARMOR_NECK", "ARMOR_EAR", "ARMOR_NUM_TYPES"}; - static string arSub3[] = { "USE_POTION", "USE_TALISMAN", "USE_TUNING", "USE_MOVE", "USE_TREASURE_BOX", "USE_MONEYBAG", "USE_BAIT", - "USE_ABILITY_UP", "USE_AFFECT", "USE_CREATE_STONE", "USE_SPECIAL", "USE_POTION_NODELAY", "USE_CLEAR", - "USE_INVISIBILITY", "USE_DETACHMENT", "USE_BUCKET", "USE_POTION_CONTINUE", "USE_CLEAN_SOCKET", - "USE_CHANGE_ATTRIBUTE", "USE_ADD_ATTRIBUTE", "USE_ADD_ACCESSORY_SOCKET", "USE_PUT_INTO_ACCESSORY_SOCKET", - "USE_ADD_ATTRIBUTE2", "USE_RECIPE", "USE_CHANGE_ATTRIBUTE2", "USE_BIND", "USE_UNBIND", "USE_TIME_CHARGE_PER", "USE_TIME_CHARGE_FIX", "USE_PUT_INTO_BELT_SOCKET", "USE_PUT_INTO_RING_SOCKET"}; - static string arSub4[] = { "AUTOUSE_POTION", "AUTOUSE_ABILITY_UP", "AUTOUSE_BOMB", "AUTOUSE_GOLD", "AUTOUSE_MONEYBAG", "AUTOUSE_TREASURE_BOX"}; - static string arSub5[] = { "MATERIAL_LEATHER", "MATERIAL_BLOOD", "MATERIAL_ROOT", "MATERIAL_NEEDLE", "MATERIAL_JEWEL", - "MATERIAL_DS_REFINE_NORMAL", "MATERIAL_DS_REFINE_BLESSED", "MATERIAL_DS_REFINE_HOLLY"}; - static string arSub6[] = { "SPECIAL_MAP", "SPECIAL_KEY", "SPECIAL_DOC", "SPECIAL_SPIRIT"}; - static string arSub7[] = { "TOOL_FISHING_ROD" }; - static string arSub8[] = { "LOTTERY_TICKET", "LOTTERY_INSTANT" }; - static string arSub10[] = { "METIN_NORMAL", "METIN_GOLD" }; - static string arSub12[] = { "FISH_ALIVE", "FISH_DEAD"}; - static string arSub14[] = { "RESOURCE_FISHBONE", "RESOURCE_WATERSTONEPIECE", "RESOURCE_WATERSTONE", "RESOURCE_BLOOD_PEARL", - "RESOURCE_BLUE_PEARL", "RESOURCE_WHITE_PEARL", "RESOURCE_BUCKET", "RESOURCE_CRYSTAL", "RESOURCE_GEM", - "RESOURCE_STONE", "RESOURCE_METIN", "RESOURCE_ORE" }; - static string arSub16[] = { "UNIQUE_NONE", "UNIQUE_BOOK", "UNIQUE_SPECIAL_RIDE", "UNIQUE_3", "UNIQUE_4", "UNIQUE_5", - "UNIQUE_6", "UNIQUE_7", "UNIQUE_8", "UNIQUE_9", "USE_SPECIAL"}; - static string arSub28[] = { "COSTUME_BODY", "COSTUME_HAIR" }; - 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 - arSub1, //1 - arSub2, //2 - arSub3, //3 - arSub4, //4 - arSub5, //5 - arSub6, //6 - arSub7, //7 - arSub8, //8 - 0, //9 - arSub10, //10 - 0, //11 - arSub12, //12 - 0, //13 - arSub14, //14 - 0, //15 - arSub16, //16 - 0, //17 - 0, //18 - 0, //19 - 0, //20 - 0, //21 - 0, //22 - 0, //23 - 0, //24 - 0, //25 - 0, //26 - 0, //27 - arSub28, //28 - arSub29, //29 - arSub29, //30 - arSub31, //31 - 0, //32 - 0, //33 반지 - 0, //34 벨트 + static string arSub1[] = {"WEAPON_SWORD", "WEAPON_DAGGER", "WEAPON_BOW", "WEAPON_TWO_HANDED", + "WEAPON_BELL", "WEAPON_FAN", "WEAPON_ARROW", "WEAPON_MOUNT_SPEAR"}; + static string arSub2[] = {"ARMOR_BODY", "ARMOR_HEAD", "ARMOR_SHIELD", "ARMOR_WRIST", "ARMOR_FOOTS", + "ARMOR_NECK", "ARMOR_EAR", "ARMOR_NUM_TYPES"}; + static string arSub3[] = {"USE_POTION", "USE_TALISMAN", "USE_TUNING", "USE_MOVE", "USE_TREASURE_BOX", "USE_MONEYBAG", "USE_BAIT", + "USE_ABILITY_UP", "USE_AFFECT", "USE_CREATE_STONE", "USE_SPECIAL", "USE_POTION_NODELAY", "USE_CLEAR", + "USE_INVISIBILITY", "USE_DETACHMENT", "USE_BUCKET", "USE_POTION_CONTINUE", "USE_CLEAN_SOCKET", + "USE_CHANGE_ATTRIBUTE", "USE_ADD_ATTRIBUTE", "USE_ADD_ACCESSORY_SOCKET", "USE_PUT_INTO_ACCESSORY_SOCKET", + "USE_ADD_ATTRIBUTE2", "USE_RECIPE", "USE_CHANGE_ATTRIBUTE2", "USE_BIND", "USE_UNBIND", "USE_TIME_CHARGE_PER", "USE_TIME_CHARGE_FIX", "USE_PUT_INTO_BELT_SOCKET", "USE_PUT_INTO_RING_SOCKET"}; + static string arSub4[] = {"AUTOUSE_POTION", "AUTOUSE_ABILITY_UP", "AUTOUSE_BOMB", "AUTOUSE_GOLD", "AUTOUSE_MONEYBAG", "AUTOUSE_TREASURE_BOX"}; + static string arSub5[] = {"MATERIAL_LEATHER", "MATERIAL_BLOOD", "MATERIAL_ROOT", "MATERIAL_NEEDLE", "MATERIAL_JEWEL", + "MATERIAL_DS_REFINE_NORMAL", "MATERIAL_DS_REFINE_BLESSED", "MATERIAL_DS_REFINE_HOLLY"}; + static string arSub6[] = {"SPECIAL_MAP", "SPECIAL_KEY", "SPECIAL_DOC", "SPECIAL_SPIRIT"}; + static string arSub7[] = {"TOOL_FISHING_ROD"}; + static string arSub8[] = {"LOTTERY_TICKET", "LOTTERY_INSTANT"}; + static string arSub10[] = {"METIN_NORMAL", "METIN_GOLD"}; + static string arSub12[] = {"FISH_ALIVE", "FISH_DEAD"}; + static string arSub14[] = {"RESOURCE_FISHBONE", "RESOURCE_WATERSTONEPIECE", "RESOURCE_WATERSTONE", "RESOURCE_BLOOD_PEARL", + "RESOURCE_BLUE_PEARL", "RESOURCE_WHITE_PEARL", "RESOURCE_BUCKET", "RESOURCE_CRYSTAL", "RESOURCE_GEM", + "RESOURCE_STONE", "RESOURCE_METIN", "RESOURCE_ORE"}; + static string arSub16[] = {"UNIQUE_NONE", "UNIQUE_BOOK", "UNIQUE_SPECIAL_RIDE", "UNIQUE_3", "UNIQUE_4", "UNIQUE_5", + "UNIQUE_6", "UNIQUE_7", "UNIQUE_8", "UNIQUE_9", "USE_SPECIAL"}; + static string arSub28[] = {"COSTUME_BODY", "COSTUME_HAIR"}; + 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 + arSub1, // 1 + arSub2, // 2 + arSub3, // 3 + arSub4, // 4 + arSub5, // 5 + arSub6, // 6 + arSub7, // 7 + arSub8, // 8 + 0, // 9 + arSub10, // 10 + 0, // 11 + arSub12, // 12 + 0, // 13 + arSub14, // 14 + 0, // 15 + arSub16, // 16 + 0, // 17 + 0, // 18 + 0, // 19 + 0, // 20 + 0, // 21 + 0, // 22 + 0, // 23 + 0, // 24 + 0, // 25 + 0, // 26 + 0, // 27 + arSub28, // 28 + arSub29, // 29 + arSub29, // 30 + arSub31, // 31 + 0, // 32 + 0, // 33 반지 + 0, // 34 벨트 }; static int arNumberOfSubtype[_countof(arSubType)] = { 0, - sizeof(arSub1)/sizeof(arSub1[0]), - sizeof(arSub2)/sizeof(arSub2[0]), - sizeof(arSub3)/sizeof(arSub3[0]), - sizeof(arSub4)/sizeof(arSub4[0]), - sizeof(arSub5)/sizeof(arSub5[0]), - sizeof(arSub6)/sizeof(arSub6[0]), - sizeof(arSub7)/sizeof(arSub7[0]), - sizeof(arSub8)/sizeof(arSub8[0]), + sizeof(arSub1) / sizeof(arSub1[0]), + sizeof(arSub2) / sizeof(arSub2[0]), + sizeof(arSub3) / sizeof(arSub3[0]), + sizeof(arSub4) / sizeof(arSub4[0]), + sizeof(arSub5) / sizeof(arSub5[0]), + sizeof(arSub6) / sizeof(arSub6[0]), + sizeof(arSub7) / sizeof(arSub7[0]), + sizeof(arSub8) / sizeof(arSub8[0]), 0, - sizeof(arSub10)/sizeof(arSub10[0]), + sizeof(arSub10) / sizeof(arSub10[0]), 0, - sizeof(arSub12)/sizeof(arSub12[0]), + sizeof(arSub12) / sizeof(arSub12[0]), 0, - sizeof(arSub14)/sizeof(arSub14[0]), + sizeof(arSub14) / sizeof(arSub14[0]), 0, - sizeof(arSub16)/sizeof(arSub16[0]), + sizeof(arSub16) / sizeof(arSub16[0]), 0, 0, 0, @@ -191,15 +191,14 @@ int get_Item_SubType_Value(int type_value, string inputString) 0, 0, 0, - sizeof(arSub28)/sizeof(arSub28[0]), - sizeof(arSub29)/sizeof(arSub29[0]), - sizeof(arSub29)/sizeof(arSub29[0]), - sizeof(arSub31)/sizeof(arSub31[0]), + sizeof(arSub28) / sizeof(arSub28[0]), + sizeof(arSub29) / sizeof(arSub29[0]), + sizeof(arSub29) / sizeof(arSub29[0]), + sizeof(arSub31) / sizeof(arSub31[0]), 0, // 32 0, // 33 반지 0, // 34 벨트 }; - assert(_countof(arSubType) > type_value && "Subtype rule: Out of range!!"); @@ -210,425 +209,508 @@ int get_Item_SubType_Value(int type_value, string inputString) return -1; } - //아이템 타입의 서브타입 어레이가 존재하는지 알아보고, 없으면 0 리턴 - if (arSubType[type_value]==0) { + // 아이템 타입의 서브타입 어레이가 존재하는지 알아보고, 없으면 0 리턴 + if (arSubType[type_value] == 0) + { return 0; } // int retInt = -1; - //cout << "SubType : " << subTypeStr << " -> "; - for (int j=0;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) + if (tempInputString.compare(tempString) == 0) { - //cout << j << " "; - retInt = j; + // cout << j << " "; + retInt = j; break; } } - //cout << endl; + // cout << endl; return retInt; } - - - - -int get_Item_AntiFlag_Value(string inputString) +int get_Item_AntiFlag_Value(string inputString) { string arAntiFlag[] = {"ANTI_FEMALE", "ANTI_MALE", "ANTI_MUSA", "ANTI_ASSASSIN", "ANTI_SURA", "ANTI_MUDANG", - "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"}; - + "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 " << retValue << endl; + delete[] arInputString; + // cout << "AntiFlag : " << antiFlagStr << " -> " << retValue << endl; return retValue; } -int get_Item_Flag_Value(string inputString) +int get_Item_Flag_Value(string inputString) { string arFlag[] = {"ITEM_TUNABLE", "ITEM_SAVE", "ITEM_STACKABLE", "COUNT_PER_1GOLD", "ITEM_SLOW_QUERY", "ITEM_UNIQUE", - "ITEM_MAKECOUNT", "ITEM_IRREMOVABLE", "CONFIRM_WHEN_USE", "QUEST_USE", "QUEST_USE_MULTIPLE", - "QUEST_GIVE", "ITEM_QUEST", "LOG", "STACKABLE", "SLOW_QUERY", "REFINEABLE", "IRREMOVABLE", "ITEM_APPLICABLE"}; - + "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 " << retValue << endl; + delete[] arInputString; + // cout << "Flag : " << flagStr << " -> " << retValue << endl; return retValue; } -int get_Item_WearFlag_Value(string inputString) +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"}; - + "WEAR_ARROW", "WEAR_HAIR", "WEAR_ABILITY"}; int retValue = 0; - string* arInputString = StringSplit(inputString, "|"); //프로토 정보 내용을 단어별로 쪼갠 배열. - for(int i =0;i " << retValue << endl; + delete[] arInputString; + // cout << "WearFlag : " << wearFlagStr << " -> " << retValue << endl; return retValue; } -int get_Item_Immune_Value(string inputString) +int get_Item_Immune_Value(string inputString) { - string arImmune[] = {"PARA","CURSE","STUN","SLEEP","SLOW","POISON","TERROR"}; + string arImmune[] = {"PARA", "CURSE", "STUN", "SLEEP", "SLOW", "POISON", "TERROR"}; int retValue = 0; - string* arInputString = StringSplit(inputString, "|"); //프로토 정보 내용을 단어별로 쪼갠 배열. - for(int i =0;i " << retValue << endl; + delete[] arInputString; + // cout << "Immune : " << immuneStr << " -> " << retValue << endl; 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 "; + for (int j = 0; j < sizeof(arLimitType) / sizeof(arLimitType[0]); j++) + { string tempString = arLimitType[j]; string tempInputString = trim(inputString); - if (tempInputString.compare(tempString)==0) + if (tempInputString.compare(tempString) == 0) { - //cout << j << " "; - retInt = j; + // cout << j << " "; + retInt = j; break; } } - //cout << endl; + // cout << endl; 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", - "APPLY_MOV_SPEED", "APPLY_CAST_SPEED", "APPLY_HP_REGEN", "APPLY_SP_REGEN", "APPLY_POISON_PCT", "APPLY_STUN_PCT", - "APPLY_SLOW_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", + string arApplyType[] = { + "APPLY_NONE", + "APPLY_MAX_HP", + "APPLY_MAX_SP", + "APPLY_CON", + "APPLY_INT", + "APPLY_STR", + "APPLY_DEX", + "APPLY_ATT_SPEED", + "APPLY_MOV_SPEED", + "APPLY_CAST_SPEED", + "APPLY_HP_REGEN", + "APPLY_SP_REGEN", + "APPLY_POISON_PCT", + "APPLY_STUN_PCT", + "APPLY_SLOW_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 "; + for (int j = 0; j < sizeof(arApplyType) / sizeof(arApplyType[0]); j++) + { string tempString = arApplyType[j]; string tempInputString = trim(inputString); - if (tempInputString.compare(tempString)==0) - { - //cout << j << " "; - retInt = j; + if (tempInputString.compare(tempString) == 0) + { + // cout << j << " "; + retInt = j; break; } } - //cout << endl; + // cout << endl; return retInt; - } +// 몬스터 프로토도 읽는다. -//몬스터 프로토도 읽는다. - - -int get_Mob_Rank_Value(string inputString) +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 "; + for (int j = 0; j < sizeof(arRank) / sizeof(arRank[0]); j++) + { string tempString = arRank[j]; string tempInputString = trim(inputString); - if (tempInputString.compare(tempString)==0) + if (tempInputString.compare(tempString) == 0) { - //cout << j << " "; - retInt = j; + // cout << j << " "; + retInt = j; break; } } - //cout << endl; + // cout << endl; return retInt; } - int get_Mob_Type_Value(string inputString) { - string arType[] = { "MONSTER", "NPC", "STONE", "WARP", "DOOR", "BUILDING", "PC", "POLYMORPH_PC", "HORSE", "GOTO"}; + string arType[] = {"MONSTER", "NPC", "STONE", "WARP", "DOOR", "BUILDING", "PC", "POLYMORPH_PC", "HORSE", "GOTO"}; int retInt = -1; - //cout << "Type : " << typeStr << " -> "; - for (int j=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) + if (tempInputString.compare(tempString) == 0) { - //cout << j << " "; - retInt = j; + // cout << j << " "; + retInt = j; break; } } - //cout << endl; + // cout << endl; return retInt; } -int get_Mob_BattleType_Value(string inputString) +int get_Mob_BattleType_Value(string inputString) { - string arBattleType[] = { "MELEE", "RANGE", "MAGIC", "SPECIAL", "POWER", "TANKER", "SUPER_POWER", "SUPER_TANKER"}; + string arBattleType[] = {"MELEE", "RANGE", "MAGIC", "SPECIAL", "POWER", "TANKER", "SUPER_POWER", "SUPER_TANKER"}; int retInt = -1; - //cout << "Battle Type : " << battleTypeStr << " -> "; - for (int j=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) - { - //cout << j << " "; - retInt = j; + if (tempInputString.compare(tempString) == 0) + { + // cout << j << " "; + retInt = j; break; } } - //cout << endl; + // cout << endl; return retInt; } int get_Mob_Size_Value(string inputString) { - string arSize[] = { "SAMLL", "MEDIUM", "BIG"}; + string arSize[] = {"SAMLL", "MEDIUM", "BIG"}; int retInt = 0; - //cout << "Size : " << sizeStr << " -> "; - for (int j=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) + if (tempInputString.compare(tempString) == 0) { - //cout << j << " "; - retInt = j + 1; + // cout << j << " "; + retInt = j + 1; break; } } - //cout << endl; + // cout << endl; return retInt; } int get_Mob_AIFlag_Value(string inputString) { - string arAIFlag[] = {"AGGR","NOMOVE","COWARD","NOATTSHINSU","NOATTCHUNJO","NOATTJINNO","ATTMOB","BERSERK","STONESKIN","GODSPEED","DEATHBLOW","REVIVE"}; - + 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 " << retValue << endl; + delete[] arInputString; + // cout << "AIFlag : " << aiFlagStr << " -> " << retValue << endl; return retValue; } int get_Mob_RaceFlag_Value(string inputString) { - string arRaceFlag[] = {"ANIMAL","UNDEAD","DEVIL","HUMAN","ORC","MILGYO","INSECT","FIRE","ICE","DESERT","TREE", - "ATT_ELEC","ATT_FIRE","ATT_ICE","ATT_WIND","ATT_EARTH","ATT_DARK"}; + string arRaceFlag[] = {"ANIMAL", "UNDEAD", "DEVIL", "HUMAN", "ORC", "MILGYO", "INSECT", "FIRE", "ICE", "DESERT", "TREE", + "ATT_ELEC", "ATT_FIRE", "ATT_ICE", "ATT_WIND", "ATT_EARTH", "ATT_DARK"}; int retValue = 0; - string* arInputString = StringSplit(inputString, ","); //프로토 정보 내용을 단어별로 쪼갠 배열. - for(int i =0;i " << retValue << endl; + delete[] arInputString; + // cout << "Race Flag : " << raceFlagStr << " -> " << retValue << endl; return retValue; } int get_Mob_ImmuneFlag_Value(string inputString) { - string arImmuneFlag[] = {"STUN","SLOW","FALL","CURSE","POISON","TERROR", "REFLECT"}; + string arImmuneFlag[] = {"STUN", "SLOW", "FALL", "CURSE", "POISON", "TERROR", "REFLECT"}; int retValue = 0; - string* arInputString = StringSplit(inputString, ","); //프로토 정보 내용을 단어별로 쪼갠 배열. - for(int i =0;i " << retValue << endl; - + delete[] arInputString; + // cout << "Immune Flag : " << immuneFlagStr << " -> " << retValue << endl; return retValue; } - #ifndef __DUMP_PROTO__ -//몹 테이블을 셋팅해준다. -bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable,std::map &nameMap) +// 몹 테이블을 셋팅해준다. +bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable, std::map &nameMap) { int col = 0; str_to_number(mobTable->dwVnum, csvTable.AsStringByIndex(col++)); strlcpy(mobTable->szName, csvTable.AsStringByIndex(col++), sizeof(mobTable->szName)); - //3. 지역별 이름 넣어주기. - map::iterator it; + // 3. 지역별 이름 넣어주기. + map::iterator it; it = nameMap.find(mobTable->dwVnum); - if (it != nameMap.end()) { - const char * localeName = it->second; - strlcpy(mobTable->szLocaleName, localeName, sizeof (mobTable->szLocaleName)); - } else { - strlcpy(mobTable->szLocaleName, mobTable->szName, sizeof (mobTable->szLocaleName)); + if (it != nameMap.end()) + { + const char *localeName = it->second; + strlcpy(mobTable->szLocaleName, localeName, sizeof(mobTable->szLocaleName)); + } + else + { + strlcpy(mobTable->szLocaleName, mobTable->szName, sizeof(mobTable->szLocaleName)); } - //RANK + // RANK int rankValue = get_Mob_Rank_Value(csvTable.AsStringByIndex(col++)); mobTable->bRank = rankValue; - //TYPE + // TYPE int typeValue = get_Mob_Type_Value(csvTable.AsStringByIndex(col++)); mobTable->bType = typeValue; - //BATTLE_TYPE + // BATTLE_TYPE int battleTypeValue = get_Mob_BattleType_Value(csvTable.AsStringByIndex(col++)); mobTable->bBattleType = battleTypeValue; str_to_number(mobTable->bLevel, csvTable.AsStringByIndex(col++)); - //SIZE + // SIZE int sizeValue = get_Mob_Size_Value(csvTable.AsStringByIndex(col++)); mobTable->bSize = sizeValue; - //AI_FLAG + // AI_FLAG int aiFlagValue = get_Mob_AIFlag_Value(csvTable.AsStringByIndex(col++)); mobTable->dwAIFlag = aiFlagValue; - //mount_capacity; + // mount_capacity; col++; - //RACE_FLAG + // RACE_FLAG int raceFlagValue = get_Mob_RaceFlag_Value(csvTable.AsStringByIndex(col++)); mobTable->dwRaceFlag = raceFlagValue; - //IMMUNE_FLAG + // IMMUNE_FLAG int immuneFlagValue = get_Mob_ImmuneFlag_Value(csvTable.AsStringByIndex(col++)); mobTable->dwImmuneFlag = immuneFlagValue; - str_to_number(mobTable->bEmpire, csvTable.AsStringByIndex(col++)); //col = 11 + str_to_number(mobTable->bEmpire, csvTable.AsStringByIndex(col++)); // col = 11 strlcpy(mobTable->szFolder, csvTable.AsStringByIndex(col++), sizeof(mobTable->szFolder)); - str_to_number(mobTable->bOnClickType, csvTable.AsStringByIndex(col++)); + str_to_number(mobTable->bOnClickType, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->bStr, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->bDex, csvTable.AsStringByIndex(col++)); @@ -638,10 +720,10 @@ bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable,std::mapdwDamageRange[1], csvTable.AsStringByIndex(col++)); str_to_number(mobTable->dwMaxHP, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->bRegenCycle, csvTable.AsStringByIndex(col++)); - str_to_number(mobTable->bRegenPercent, csvTable.AsStringByIndex(col++)); + str_to_number(mobTable->bRegenPercent, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->dwGoldMin, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->dwGoldMax, csvTable.AsStringByIndex(col++)); - str_to_number(mobTable->dwExp, csvTable.AsStringByIndex(col++)); + str_to_number(mobTable->dwExp, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->wDef, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->sAttackSpeed, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->sMovingSpeed, csvTable.AsStringByIndex(col++)); @@ -649,7 +731,7 @@ bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable,std::mapwAggressiveSight, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->wAttackRange, csvTable.AsStringByIndex(col++)); - str_to_number(mobTable->dwDropItemVnum, csvTable.AsStringByIndex(col++)); //32 + str_to_number(mobTable->dwDropItemVnum, csvTable.AsStringByIndex(col++)); // 32 str_to_number(mobTable->dwResurrectionVnum, csvTable.AsStringByIndex(col++)); for (int i = 0; i < MOB_ENCHANTS_MAX_NUM; ++i) str_to_number(mobTable->cEnchants[i], csvTable.AsStringByIndex(col++)); @@ -661,7 +743,7 @@ bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable,std::mapdwSummonVnum, csvTable.AsStringByIndex(col++)); str_to_number(mobTable->dwDrainSP, csvTable.AsStringByIndex(col++)); - //Mob_Color + // Mob_Color ++col; str_to_number(mobTable->dwPolymorphItemVnum, csvTable.AsStringByIndex(col++)); @@ -688,47 +770,71 @@ bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable,std::map &nameMap) +bool Set_Proto_Item_Table(TItemTable *itemTable, cCsvTable &csvTable, std::map &nameMap) { int col = 0; int dataArray[33]; - for (int i=0; iszName, csvTable.AsStringByIndex(1), sizeof(itemTable->szName)); - //지역별 이름 넣어주기. - map::iterator it; + // 지역별 이름 넣어주기. + map::iterator it; it = nameMap.find(itemTable->dwVnum); - if (it != nameMap.end()) { - const char * localeName = it->second; - strlcpy(itemTable->szLocaleName, localeName, sizeof (itemTable->szLocaleName)); - } else { - strlcpy(itemTable->szLocaleName, itemTable->szName, sizeof (itemTable->szLocaleName)); + if (it != nameMap.end()) + { + const char *localeName = it->second; + strlcpy(itemTable->szLocaleName, localeName, sizeof(itemTable->szLocaleName)); + } + else + { + strlcpy(itemTable->szLocaleName, itemTable->szName, sizeof(itemTable->szLocaleName)); } itemTable->bType = dataArray[2]; itemTable->bSubType = dataArray[3]; @@ -805,33 +914,32 @@ bool Set_Proto_Item_Table(TItemTable *itemTable, cCsvTable &csvTable,std::mapaLimits[i].bType = dataArray[14+i*2]; - itemTable->aLimits[i].lValue = dataArray[15+i*2]; + itemTable->aLimits[i].bType = dataArray[14 + i * 2]; + itemTable->aLimits[i].lValue = dataArray[15 + i * 2]; if (LIMIT_REAL_TIME_START_FIRST_USE == itemTable->aLimits[i].bType) itemTable->cLimitRealTimeFirstUseIndex = (char)i; if (LIMIT_TIMER_BASED_ON_WEAR == itemTable->aLimits[i].bType) itemTable->cLimitTimerBasedOnWearIndex = (char)i; - } for (i = 0; i < ITEM_APPLY_MAX_NUM; ++i) { - itemTable->aApplies[i].bType = dataArray[18+i*2]; - itemTable->aApplies[i].lValue = dataArray[19+i*2]; + itemTable->aApplies[i].bType = dataArray[18 + i * 2]; + itemTable->aApplies[i].lValue = dataArray[19 + i * 2]; } for (i = 0; i < ITEM_VALUES_MAX_NUM; ++i) - itemTable->alValues[i] = dataArray[24+i]; + itemTable->alValues[i] = dataArray[24 + i]; - //column for 'Specular' + // column for 'Specular' itemTable->bGainSocketPct = dataArray[31]; itemTable->sAddonType = dataArray[32]; - //test + // test str_to_number(itemTable->bWeight, "0"); - + return true; } diff --git a/src/db/src/ProtoReader.h b/src/db/src/ProtoReader.h index 260ccdb..a82b1b1 100644 --- a/src/db/src/ProtoReader.h +++ b/src/db/src/ProtoReader.h @@ -6,7 +6,7 @@ #include "CsvReader.h" -//csv 파일을 읽어와서 아이템 테이블에 넣어준다. +// csv 파일을 읽어와서 아이템 테이블에 넣어준다. void putItemIntoTable(); //(테이블, 테스트여부) int get_Item_Type_Value(std::string inputString); @@ -18,8 +18,7 @@ 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); int get_Mob_BattleType_Value(std::string inputString); @@ -30,7 +29,7 @@ int get_Mob_RaceFlag_Value(std::string inputString); int get_Mob_ImmuneFlag_Value(std::string inputString); // -bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable, std::map &nameMap); -bool Set_Proto_Item_Table(TItemTable *itemTable, cCsvTable &csvTable,std::map &nameMap); +bool Set_Proto_Mob_Table(TMobTable *mobTable, cCsvTable &csvTable, std::map &nameMap); +bool Set_Proto_Item_Table(TItemTable *itemTable, cCsvTable &csvTable, std::map &nameMap); #endif \ No newline at end of file diff --git a/src/db/src/QID.h b/src/db/src/QID.h index 86ca086..dfad6f8 100644 --- a/src/db/src/QID.h +++ b/src/db/src/QID.h @@ -6,33 +6,33 @@ */ enum QID { - QID_PLAYER, // 0 - QID_ITEM, // 1 - QID_QUEST, // 2 - QID_AFFECT, // 3 - QID_LOGIN, // 4 - QID_SAFEBOX_LOAD, // 5 - QID_SAFEBOX_CHANGE_SIZE, // 6 - QID_SAFEBOX_CHANGE_PASSWORD, // 7 - QID_SAFEBOX_CHANGE_PASSWORD_SECOND, // 8 - QID_SAFEBOX_SAVE, // 9 - QID_ITEM_SAVE, // 10 - QID_ITEM_DESTROY, // 11 - QID_QUEST_SAVE, // 12 - QID_PLAYER_SAVE, // 13 - QID_PLAYER_DELETE, // 14 - QID_LOGIN_BY_KEY, // 15 - QID_PLAYER_INDEX_CREATE, // 16 - QID_ITEM_AWARD_LOAD, // 17 - QID_ITEM_AWARD_TAKEN, // 18 - QID_GUILD_RANKING, // 19 + QID_PLAYER, // 0 + QID_ITEM, // 1 + QID_QUEST, // 2 + QID_AFFECT, // 3 + QID_LOGIN, // 4 + QID_SAFEBOX_LOAD, // 5 + QID_SAFEBOX_CHANGE_SIZE, // 6 + QID_SAFEBOX_CHANGE_PASSWORD, // 7 + QID_SAFEBOX_CHANGE_PASSWORD_SECOND, // 8 + QID_SAFEBOX_SAVE, // 9 + QID_ITEM_SAVE, // 10 + QID_ITEM_DESTROY, // 11 + QID_QUEST_SAVE, // 12 + QID_PLAYER_SAVE, // 13 + QID_PLAYER_DELETE, // 14 + QID_LOGIN_BY_KEY, // 15 + QID_PLAYER_INDEX_CREATE, // 16 + QID_ITEM_AWARD_LOAD, // 17 + QID_ITEM_AWARD_TAKEN, // 18 + QID_GUILD_RANKING, // 19 - // MYSHOP_PRICE_LIST - QID_ITEMPRICE_SAVE, ///< 20, 아이템 가격정보 저장 쿼리 - QID_ITEMPRICE_DESTROY, ///< 21, 아이템 가격정보 삭제 쿼리 - QID_ITEMPRICE_LOAD_FOR_UPDATE, ///< 22, 가격정보 업데이트를 위한 아이템 가격정보 로드 쿼리 - QID_ITEMPRICE_LOAD, ///< 22, 아이템 가격정보 로드 쿼리 - // END_OF_MYSHOP_PRICE_LIST + // MYSHOP_PRICE_LIST + QID_ITEMPRICE_SAVE, ///< 20, 아이템 가격정보 저장 쿼리 + QID_ITEMPRICE_DESTROY, ///< 21, 아이템 가격정보 삭제 쿼리 + QID_ITEMPRICE_LOAD_FOR_UPDATE, ///< 22, 가격정보 업데이트를 위한 아이템 가격정보 로드 쿼리 + QID_ITEMPRICE_LOAD, ///< 22, 아이템 가격정보 로드 쿼리 + // END_OF_MYSHOP_PRICE_LIST }; #endif diff --git a/src/db/src/grid.cpp b/src/db/src/grid.cpp index 922c4ba..4c45cc5 100644 --- a/src/db/src/grid.cpp +++ b/src/db/src/grid.cpp @@ -9,7 +9,7 @@ CGrid::CGrid(int w, int h) : m_iWidth(w), m_iHeight(h) memset(m_pGrid, 0, sizeof(char) * m_iWidth * m_iHeight); } -CGrid::CGrid(CGrid * pkGrid, int w, int h) : m_iWidth(w), m_iHeight(h) +CGrid::CGrid(CGrid *pkGrid, int w, int h) : m_iWidth(w), m_iHeight(h) { m_pGrid = new char[m_iWidth * m_iHeight]; int iSize = std::min(w * h, pkGrid->m_iWidth * pkGrid->m_iHeight); @@ -18,7 +18,7 @@ CGrid::CGrid(CGrid * pkGrid, int w, int h) : m_iWidth(w), m_iHeight(h) CGrid::~CGrid() { - delete [] m_pGrid; + delete[] m_pGrid; } void CGrid::Clear() @@ -126,4 +126,3 @@ unsigned int CGrid::GetSize() { return m_iWidth * m_iHeight; } - diff --git a/src/db/src/grid.h b/src/db/src/grid.h index 9ae21ed..48a0be8 100644 --- a/src/db/src/grid.h +++ b/src/db/src/grid.h @@ -4,24 +4,24 @@ class CGrid { - public: +public: CGrid(int w, int h); - CGrid(CGrid * pkGrid, int w, int h); + CGrid(CGrid *pkGrid, int w, int h); ~CGrid(); - void Clear(); - int FindBlank(int w, int h); - bool IsEmpty(int iPos, int w, int h); - bool Put(int iPos, int w, int h); - void Get(int iPos, int w, int h); - void Print(); - unsigned int GetSize(); + void Clear(); + int FindBlank(int w, int h); + bool IsEmpty(int iPos, int w, int h); + bool Put(int iPos, int w, int h); + void Get(int iPos, int w, int h); + void Print(); + unsigned int GetSize(); - protected: - int m_iWidth; - int m_iHeight; +protected: + int m_iWidth; + int m_iHeight; - char * m_pGrid; + char *m_pGrid; }; #endif diff --git a/src/db/src/version.cpp b/src/db/src/version.cpp index c6347e8..2b7582a 100644 --- a/src/db/src/version.cpp +++ b/src/db/src/version.cpp @@ -1,8 +1,12 @@ #include +#ifndef __INTELLISENSE__ #include +#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__); } - diff --git a/src/game/src/main.cpp b/src/game/src/main.cpp index 7c3423c..3ad4148 100644 --- a/src/game/src/main.cpp +++ b/src/game/src/main.cpp @@ -56,7 +56,11 @@ #include "skill_power.h" #include "SpeedServer.h" #include "DragonSoul.h" +#ifndef __INTELLISENSE__ #include +#else +#include <../../../common/version.h> +#endif #include #include #include @@ -65,46 +69,32 @@ #include #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시간 간격 +static const DWORD TRAFFIC_PROFILE_FLUSH_CYCLE = 3600; ///< TrafficProfiler 의 Flush cycle. 1시간 간격 // END_OF_TRAFFIC_PROFILER // 게임과 연결되는 소켓 -volatile int num_events_called = 0; -int max_bytes_written = 0; -int current_bytes_written = 0; -int total_bytes_written = 0; -BYTE g_bLogLevel = 0; +volatile int num_events_called = 0; +int max_bytes_written = 0; +int current_bytes_written = 0; +int total_bytes_written = 0; +BYTE g_bLogLevel = 0; -evconnlistener * tcp_listener = nullptr; -evconnlistener * p2p_listener = nullptr; +evconnlistener *tcp_listener = nullptr; +evconnlistener *p2p_listener = nullptr; -event_base * ev_base = nullptr; -evdns_base * dns_base = nullptr; +event_base *ev_base = nullptr; +evdns_base *dns_base = nullptr; static void AcceptError(evconnlistener *listener, void *ctx); -static void AcceptTCPConnection(evconnlistener* listener, evutil_socket_t fd, sockaddr* address, int socklen, void* ctx); -static void AcceptP2PConnection(evconnlistener* listener, evutil_socket_t fd, sockaddr* address, int socklen, void* ctx); +static void AcceptTCPConnection(evconnlistener *listener, evutil_socket_t fd, sockaddr *address, int socklen, void *ctx); +static void AcceptP2PConnection(evconnlistener *listener, evutil_socket_t fd, sockaddr *address, int socklen, void *ctx); -int io_loop(event_base * base); +int io_loop(event_base *base); -int start(int argc, char **argv); -int idle(); -void destroy(); +int start(int argc, char **argv); +int idle(); +void destroy(); enum EProfile { @@ -120,7 +110,7 @@ static DWORD s_dwProfiler[PROF_MAX_NUM]; int g_shutdown_disconnect_pulse; int g_shutdown_disconnect_force_pulse; int g_shutdown_core_pulse; -bool g_bShutdown=false; +bool g_bShutdown = false; extern int speed_server; extern void CancelReloadSpamEvent(); @@ -128,16 +118,17 @@ extern void CancelReloadSpamEvent(); void ContinueOnFatalError() { #ifdef USE_STACKTRACE - void* array[200]; + void *array[200]; std::size_t size; - char** symbols; + char **symbols; size = backtrace(array, 200); symbols = backtrace_symbols(array, size); 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; } @@ -178,7 +169,7 @@ namespace { struct SendDisconnectFunc { - void operator () (LPDESC d) + void operator()(LPDESC d) { if (d->GetCharacter()) { @@ -190,7 +181,7 @@ namespace struct DisconnectFunc { - void operator () (LPDESC d) + void operator()(LPDESC d) { if (d->GetType() == DESC_TYPE_CONNECTOR) return; @@ -208,7 +199,7 @@ extern std::map g_simByPID; extern std::vector g_vec_save; unsigned int save_idx = 0; -void heartbeat(LPHEART ht, int pulse) +void heartbeat(LPHEART ht, int pulse) { DWORD t; @@ -259,7 +250,7 @@ void heartbeat(LPHEART ht, int pulse) for (int i = 0; i < count; ++i, ++save_idx) db_clientdesc->DBPacket(HEADER_GD_PLAYER_SAVE, 0, &g_vec_save[save_idx], sizeof(TPlayerTable)); - SPDLOG_DEBUG("SAVE_FLUSH {}", count); + SPDLOG_DEBUG("SAVE_FLUSH {}", count); } } } @@ -289,13 +280,13 @@ void heartbeat(LPHEART ht, int pulse) { if (thecore_pulse() > g_shutdown_disconnect_pulse) { - const DESC_MANAGER::DESC_SET & c_set_desc = DESC_MANAGER::instance().GetClientSet(); + const DESC_MANAGER::DESC_SET &c_set_desc = DESC_MANAGER::instance().GetClientSet(); std::for_each(c_set_desc.begin(), c_set_desc.end(), ::SendDisconnectFunc()); g_shutdown_disconnect_pulse = INT_MAX; } else if (thecore_pulse() > g_shutdown_disconnect_force_pulse) { - const DESC_MANAGER::DESC_SET & c_set_desc = DESC_MANAGER::instance().GetClientSet(); + const DESC_MANAGER::DESC_SET &c_set_desc = DESC_MANAGER::instance().GetClientSet(); std::for_each(c_set_desc.begin(), c_set_desc.end(), ::DisconnectFunc()); } else if (thecore_pulse() > g_shutdown_disconnect_force_pulse + PASSES_PER_SEC(5)) @@ -305,7 +296,8 @@ void heartbeat(LPHEART ht, int pulse) } } -static void CleanUpForEarlyExit() { +static void CleanUpForEarlyExit() +{ CancelReloadSpamEvent(); } @@ -318,64 +310,66 @@ int main(int argc, char **argv) ilInit(); // DevIL Initialize WriteVersion(); - log_init(); - - SECTREE_MANAGER sectree_manager; - CHARACTER_MANAGER char_manager; - ITEM_MANAGER item_manager; - CShopManager shop_manager; - CMobManager mob_manager; - CMotionManager motion_manager; - CPartyManager party_manager; - CSkillManager skill_manager; - CPVPManager pvp_manager; - LZOManager lzo_manager; - DBManager db_manager; - AccountDB account_db; + log_init(); - LogManager log_manager; - MessengerManager messenger_manager; - P2P_MANAGER p2p_manager; - CGuildManager guild_manager; + SECTREE_MANAGER sectree_manager; + CHARACTER_MANAGER char_manager; + ITEM_MANAGER item_manager; + CShopManager shop_manager; + CMobManager mob_manager; + CMotionManager motion_manager; + CPartyManager party_manager; + CSkillManager skill_manager; + CPVPManager pvp_manager; + LZOManager lzo_manager; + DBManager db_manager; + AccountDB account_db; + + LogManager log_manager; + MessengerManager messenger_manager; + P2P_MANAGER p2p_manager; + CGuildManager guild_manager; CGuildMarkManager mark_manager; - CDungeonManager dungeon_manager; - CRefineManager refine_manager; - CBanwordManager banword_manager; - CPrivManager priv_manager; - CWarMapManager war_map_manager; - building::CManager building_manager; - CTargetManager target_manager; - marriage::CManager marriage_manager; + CDungeonManager dungeon_manager; + CRefineManager refine_manager; + CBanwordManager banword_manager; + CPrivManager priv_manager; + CWarMapManager war_map_manager; + building::CManager building_manager; + CTargetManager target_manager; + marriage::CManager marriage_manager; marriage::WeddingManager wedding_manager; - CItemAddonManager item_addon_manager; + CItemAddonManager item_addon_manager; CArenaManager arena_manager; COXEventManager OXEvent_manager; - CMonarch Monarch; + CMonarch Monarch; CHorseNameManager horsename_manager; - DESC_MANAGER desc_manager; + DESC_MANAGER desc_manager; - TrafficProfiler trafficProfiler; + TrafficProfiler trafficProfiler; CTableBySkill SkillPowerByLevel; CPolymorphUtils polymorph_utils; - CProfiler profiler; - CBattleArena ba; - COver9RefineManager o9r; - SpamManager spam_mgr; - CThreeWayWar threeway_war; - CDragonLairManager dl_manager; + CProfiler profiler; + CBattleArena ba; + COver9RefineManager o9r; + SpamManager spam_mgr; + CThreeWayWar threeway_war; + CDragonLairManager dl_manager; 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; } @@ -391,10 +385,11 @@ int main(int argc, char **argv) Blend_Item_init(); ani_init(); - if ( g_bTrafficProfileOn ) - TrafficProfiler::instance().Initialize( TRAFFIC_PROFILE_FLUSH_CYCLE, "ProfileLog" ); + if (g_bTrafficProfileOn) + TrafficProfiler::instance().Initialize(TRAFFIC_PROFILE_FLUSH_CYCLE, "ProfileLog"); - while (idle()); + while (idle()) + ; SPDLOG_INFO(" Starting..."); g_bShutdown = true; @@ -456,7 +451,7 @@ int main(int argc, char **argv) trafficProfiler.Flush(); destroy(); - log_destroy(); + log_destroy(); #ifdef DEBUG_ALLOC DebugAllocator::StaticTearDown(); @@ -468,83 +463,78 @@ int main(int argc, char **argv) void usage() { printf("Option list\n" - "-p : bind port number (port must be over 1024)\n" - "-l : sets log level\n" - "-r : do not load regen tables\n" - "-t : traffic proflie on\n"); + "-p : bind port number (port must be over 1024)\n" + "-l : sets log level\n" + "-r : do not load regen tables\n" + "-t : traffic proflie on\n"); } 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; + int ch; while ((ch = getopt(argc, argv, "n:p:erl:tI:")) != -1) { - char* ep = NULL; + char *ep = NULL; switch (ch) { - case 'I': // IP - g_szPublicIP = std::string(optarg); + case 'I': // IP + g_szPublicIP = std::string(optarg); - printf("IP %s\n", g_szPublicIP.c_str()); + printf("IP %s\n", g_szPublicIP.c_str()); - break; + break; - case 'p': // port - mother_port = strtol(optarg, &ep, 10); + case 'p': // port + mother_port = strtol(optarg, &ep, 10); - if (mother_port <= 1024) - { - usage(); - return 0; - } + if (mother_port <= 1024) + { + usage(); + return 0; + } - printf("port %hu\n", mother_port); + printf("port %hu\n", mother_port); - break; + break; - case 'l': - { - int l = strtol(optarg, &ep, 10); + case 'l': + { + int l = strtol(optarg, &ep, 10); - log_set_level(l); - } - break; + log_set_level(l); + } + break; - // LOCALE_SERVICE - case 'n': - st_localeServiceName = optarg; - break; - // END_OF_LOCALE_SERVICE + // LOCALE_SERVICE + case 'n': + st_localeServiceName = optarg; + break; + // END_OF_LOCALE_SERVICE - case 'r': - g_bNoRegen = true; - break; + case 'r': + g_bNoRegen = true; + break; - // TRAFFIC_PROFILER - case 't': - g_bTrafficProfileOn = true; - break; - // END_OF_TRAFFIC_PROFILER + // TRAFFIC_PROFILER + case 't': + g_bTrafficProfileOn = true; + break; + // END_OF_TRAFFIC_PROFILER - case '?': - if (strchr("Ipln", optopt)) - SPDLOG_ERROR("Option -{} requires an argument.", optopt); - else if (isprint (optopt)) - SPDLOG_ERROR("Unknown option `-{}'.", optopt); - else - SPDLOG_ERROR("Unknown option character `\\x{}'.", optopt); - default: - usage(); - return 1; - break; + case '?': + if (strchr("Ipln", optopt)) + SPDLOG_ERROR("Option -{} requires an argument.", optopt); + else if (isprint(optopt)) + SPDLOG_ERROR("Unknown option `-{}'.", optopt); + else + SPDLOG_ERROR("Unknown option character `\\x{}'.", optopt); + default: + usage(); + return 1; + break; } } @@ -556,7 +546,7 @@ int start(int argc, char **argv) if (!is_thecore_initialized) { - SPDLOG_CRITICAL("Could not initialize thecore, check owner of pid, syslog"); + SPDLOG_CRITICAL("Could not initialize thecore, check owner of pid, syslog"); exit(EXIT_FAILURE); } @@ -564,79 +554,84 @@ int start(int argc, char **argv) { if (false == g_bAuthServer) { - SPDLOG_CRITICAL("Could not Load ThreeWayWar Setting file"); + SPDLOG_CRITICAL("Could not Load ThreeWayWar Setting file"); exit(EXIT_FAILURE); } } signal_timer_disable(); - // Initialize the network stack + // Initialize the network stack - // Check if the public and internal IP addresses were configured - 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()) { - SPDLOG_CRITICAL("Public IP address could not be automatically detected. Manually set the IP and try again."); - exit(EXIT_FAILURE); - } + // Check if the public and internal IP addresses were configured + 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()) + { + 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) { - SPDLOG_CRITICAL("Libevent base initialization FAILED!"); - exit(EXIT_FAILURE); - } + // Create a new libevent base and listen for new connections + ev_base = event_base_new(); + if (!ev_base) + { + SPDLOG_CRITICAL("Libevent base initialization FAILED!"); + exit(EXIT_FAILURE); + } - dns_base = evdns_base_new(ev_base, 1); - if (!dns_base) { - SPDLOG_CRITICAL("Libevent DNS base initialization FAILED!"); - exit(EXIT_FAILURE); - } + dns_base = evdns_base_new(ev_base, 1); + if (!dns_base) + { + SPDLOG_CRITICAL("Libevent DNS base initialization FAILED!"); + exit(EXIT_FAILURE); + } - sockaddr_in sin = {}; + sockaddr_in sin = {}; - // Main TCP listener - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = inet_addr(g_szPublicBindIP.c_str()); - sin.sin_port = htons(mother_port); + // Main TCP listener + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = inet_addr(g_szPublicBindIP.c_str()); + sin.sin_port = htons(mother_port); - tcp_listener = evconnlistener_new_bind( - ev_base, - AcceptTCPConnection, nullptr, - LEV_OPT_CLOSE_ON_FREE|LEV_OPT_REUSEABLE, -1, - (const sockaddr*)&sin, sizeof(sin) - ); - if (!tcp_listener) { - SPDLOG_CRITICAL("TCP listener initialization FAILED!"); - exit(EXIT_FAILURE); - } - SPDLOG_INFO("TCP listening on {}:{}", g_szPublicBindIP, mother_port); - evconnlistener_set_error_cb(tcp_listener, AcceptError); + tcp_listener = evconnlistener_new_bind( + ev_base, + AcceptTCPConnection, nullptr, + LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, -1, + (const sockaddr *)&sin, sizeof(sin)); + if (!tcp_listener) + { + SPDLOG_CRITICAL("TCP listener initialization FAILED!"); + exit(EXIT_FAILURE); + } + SPDLOG_INFO("TCP listening on {}:{}", g_szPublicBindIP, mother_port); + evconnlistener_set_error_cb(tcp_listener, AcceptError); - // Game P2P listener - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = inet_addr(g_szInternalBindIP.c_str()); - sin.sin_port = htons(p2p_port); + // Game P2P listener + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = inet_addr(g_szInternalBindIP.c_str()); + sin.sin_port = htons(p2p_port); - p2p_listener = evconnlistener_new_bind( - ev_base, - AcceptP2PConnection, nullptr, - LEV_OPT_CLOSE_ON_FREE|LEV_OPT_REUSEABLE, -1, - (const sockaddr*)&sin, sizeof(sin) - ); - if (!p2p_listener) { - SPDLOG_CRITICAL("P2P listener initialization FAILED!"); - exit(EXIT_FAILURE); - } - SPDLOG_INFO("P2P listening on {}:{}", g_szInternalBindIP, p2p_port); - evconnlistener_set_error_cb(p2p_listener, AcceptError); + p2p_listener = evconnlistener_new_bind( + ev_base, + AcceptP2PConnection, nullptr, + LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, -1, + (const sockaddr *)&sin, sizeof(sin)); + if (!p2p_listener) + { + SPDLOG_CRITICAL("P2P listener initialization FAILED!"); + exit(EXIT_FAILURE); + } + SPDLOG_INFO("P2P listening on {}:{}", g_szInternalBindIP, p2p_port); + evconnlistener_set_error_cb(p2p_listener, AcceptError); - // Create client connections + // 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); } @@ -644,17 +639,16 @@ int start(int argc, char **argv) { if (g_stAuthMasterIP.length() != 0) { - SPDLOG_INFO("SlaveAuth"); + SPDLOG_INFO("SlaveAuth"); 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 { - SPDLOG_INFO("MasterAuth"); + SPDLOG_INFO("MasterAuth"); } - } + } /* game server to spam server */ else { @@ -662,8 +656,8 @@ int start(int argc, char **argv) extern unsigned int g_uiSpamBlockScore; extern unsigned int g_uiSpamReloadCycle; - SPDLOG_INFO("SPAM_CONFIG: duration {} score {} reload cycle {}", - g_uiSpamBlockDuration, g_uiSpamBlockScore, g_uiSpamReloadCycle); + SPDLOG_INFO("SPAM_CONFIG: duration {} score {} reload cycle {}", + g_uiSpamBlockDuration, g_uiSpamBlockScore, g_uiSpamReloadCycle); extern void LoadSpamDB(); LoadSpamDB(); @@ -675,51 +669,55 @@ int start(int argc, char **argv) void destroy() { - SPDLOG_INFO(" Canceling ReloadSpamEvent..."); + SPDLOG_INFO(" Canceling ReloadSpamEvent..."); CancelReloadSpamEvent(); - SPDLOG_INFO(" regen_free()..."); + SPDLOG_INFO(" regen_free()..."); regen_free(); - SPDLOG_INFO(" Closing network stack..."); - if (tcp_listener) { - evconnlistener_free(tcp_listener); - tcp_listener = nullptr; - } + SPDLOG_INFO(" Closing network stack..."); + if (tcp_listener) + { + evconnlistener_free(tcp_listener); + tcp_listener = nullptr; + } - if (p2p_listener) { - evconnlistener_free(p2p_listener); + if (p2p_listener) + { + evconnlistener_free(p2p_listener); p2p_listener = nullptr; - } + } - if (dns_base) { - evdns_base_free(dns_base, 0); + if (dns_base) + { + evdns_base_free(dns_base, 0); dns_base = nullptr; - } + } - if (ev_base) { - event_base_free(ev_base); - ev_base = nullptr; - } + if (ev_base) + { + event_base_free(ev_base); + ev_base = nullptr; + } - SPDLOG_INFO(" event_destroy()..."); + SPDLOG_INFO(" event_destroy()..."); event_destroy(); - SPDLOG_INFO(" CTextFileLoader::DestroySystem()..."); + SPDLOG_INFO(" CTextFileLoader::DestroySystem()..."); CTextFileLoader::DestroySystem(); - SPDLOG_INFO(" thecore_destroy()..."); + SPDLOG_INFO(" thecore_destroy()..."); thecore_destroy(); } int idle() { - static struct timeval pta = { 0, 0 }; - static int process_time_count = 0; - struct timeval now; + static struct timeval pta = {0, 0}; + static int process_time_count = 0; + struct timeval now; if (pta.tv_sec == 0) - gettimeofday(&pta, (struct timezone *) 0); + gettimeofday(&pta, (struct timezone *)0); int passed_pulses; @@ -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,31 +742,32 @@ 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); + gettimeofday(&now, (struct timezone *)0); ++process_time_count; if (now.tv_sec - pta.tv_sec > 0) { SPDLOG_TRACE("[{:3}] event {:5}/{:<5} idle {:<4} event {:<4} heartbeat {:<4} I/O {:<4} chrUpate {:<4} | WRITE: {:<7} | PULSE: {}", - process_time_count, - num_events_called, - event_count(), - thecore_profiler[PF_IDLE], - s_dwProfiler[PROF_EVENT], - s_dwProfiler[PROF_HEARTBEAT], - s_dwProfiler[PROF_IO], - s_dwProfiler[PROF_CHR_UPDATE], - current_bytes_written, - thecore_pulse()); + process_time_count, + num_events_called, + event_count(), + thecore_profiler[PF_IDLE], + s_dwProfiler[PROF_EVENT], + s_dwProfiler[PROF_HEARTBEAT], + s_dwProfiler[PROF_IO], + s_dwProfiler[PROF_CHR_UPDATE], + current_bytes_written, + thecore_pulse()); num_events_called = 0; current_bytes_written = 0; - process_time_count = 0; - gettimeofday(&pta, (struct timezone *) 0); + process_time_count = 0; + gettimeofday(&pta, (struct timezone *)0); memset(&thecore_profiler[0], 0, sizeof(thecore_profiler)); memset(&s_dwProfiler[0], 0, sizeof(s_dwProfiler)); @@ -776,38 +776,38 @@ int idle() return 1; } -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)); +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)); - event_base_loopexit(base, nullptr); - ShutdownOnFatalError(); + event_base_loopexit(base, nullptr); + ShutdownOnFatalError(); } -static void AcceptTCPConnection(evconnlistener* listener, evutil_socket_t fd, sockaddr* address, int socklen, void* ctx) +static void AcceptTCPConnection(evconnlistener *listener, evutil_socket_t fd, sockaddr *address, int socklen, void *ctx) { - // Initialize the peer - DESC_MANAGER::instance().AcceptDesc(listener, fd, address); + // Initialize the peer + DESC_MANAGER::instance().AcceptDesc(listener, fd, address); } -static void AcceptP2PConnection(evconnlistener* listener, evutil_socket_t fd, sockaddr* address, int socklen, void* ctx) +static void AcceptP2PConnection(evconnlistener *listener, evutil_socket_t fd, sockaddr *address, int socklen, void *ctx) { - // Initialize the peer - DESC_MANAGER::instance().AcceptP2PDesc(listener, fd, address); + // Initialize the peer + DESC_MANAGER::instance().AcceptP2PDesc(listener, fd, address); } -int io_loop(event_base * base) +int io_loop(event_base *base) { - LPDESC d; - int num_events, event_idx; + LPDESC d; + int num_events, event_idx; DESC_MANAGER::instance().DestroyClosed(); // PHASE_CLOSE인 접속들을 끊어준다. DESC_MANAGER::instance().TryConnect(); - // Process network events - event_base_loop(base, EVLOOP_NONBLOCK); + // Process network events + event_base_loop(base, EVLOOP_NONBLOCK); return 1; } - diff --git a/src/game/src/version.cpp b/src/game/src/version.cpp index 70b140b..3ca5955 100644 --- a/src/game/src/version.cpp +++ b/src/game/src/version.cpp @@ -1,8 +1,12 @@ #include +#ifndef __INTELLISENSE__ #include +#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__); } - diff --git a/src/libsql/include/PgAsyncQuery.h b/src/libsql/include/PgAsyncQuery.h new file mode 100644 index 0000000..158c352 --- /dev/null +++ b/src/libsql/include/PgAsyncQuery.h @@ -0,0 +1,15 @@ +#pragma once + +#include +#include + +class PgAsyncQuery +{ +public: + int id; + std::string query; + pqxx::params parameters; + + PgAsyncQuery(int msgId, const std::string &sql, const pqxx::params ¶ms = pqxx::params{}) + : id(msgId), query(sql), parameters(params) {} +}; \ No newline at end of file diff --git a/src/libsql/include/PgConnectionPool.h b/src/libsql/include/PgConnectionPool.h new file mode 100644 index 0000000..439cbfd --- /dev/null +++ b/src/libsql/include/PgConnectionPool.h @@ -0,0 +1,175 @@ +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +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 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> acquireAsync() + { + return std::async(std::launch::async, [this]() + { return this->acquire(); }); + } + + // Blocking acquire + std::shared_ptr acquire() + { + std::unique_lock 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( + entry.conn.release(), + [this](pqxx::connection *p) + { + std::lock_guard lock(mutex_); + auto now = std::chrono::steady_clock::now(); + if (p->is_open()) + { + pool_.push({std::unique_ptr(p), now}); + } + else + { + delete p; + pool_.push({createConnection(), now}); + } + cond_.notify_one(); + }); + } + +private: + struct ConnectionEntry + { + std::unique_ptr conn; + std::chrono::steady_clock::time_point last_used; + }; + + std::unique_ptr 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(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 lock(mutex_); + size_t current_size = pool_.size(); + + std::queue temp; + auto now = std::chrono::steady_clock::now(); + + while (!pool_.empty()) + { + auto entry = std::move(pool_.front()); + pool_.pop(); + + if (std::chrono::duration_cast( + 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 pool_; + std::mutex mutex_; + std::condition_variable cond_; + + std::thread cleaner_thread_; + std::atomic stop_cleaner_; +};