From 37561f1cd793dab13ccd293c9b78e8264e0e0b84 Mon Sep 17 00:00:00 2001 From: d1str4ught <> Date: Fri, 22 Aug 2025 19:57:33 +0200 Subject: [PATCH] some small fixes --- src/game/MarkImage.cpp | 2 +- src/game/MarkImage.h | 2 +- src/game/MarkManager.cpp | 2 +- src/game/MarkManager.h | 2 +- src/game/db.cpp | 2 +- src/game/db.h | 2 +- src/game/input.cpp | 2 ++ src/game/login_data.cpp | 20 ++++++++++---------- src/game/login_data.h | 32 ++++++++++++++++---------------- 9 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/game/MarkImage.cpp b/src/game/MarkImage.cpp index ae7c656..ce983a2 100644 --- a/src/game/MarkImage.cpp +++ b/src/game/MarkImage.cpp @@ -198,7 +198,7 @@ DWORD CGuildMarkImage::GetEmptyPosition() return INVALID_MARK_POSITION; } -void CGuildMarkImage::GetDiffBlocks(const DWORD * crcList, std::map & mapDiffBlocks) +void CGuildMarkImage::GetDiffBlocks(const uint32_t* crcList, std::map & mapDiffBlocks) { BYTE posBlock = 0; diff --git a/src/game/MarkImage.h b/src/game/MarkImage.h index 97b8574..380d281 100644 --- a/src/game/MarkImage.h +++ b/src/game/MarkImage.h @@ -91,7 +91,7 @@ class CGuildMarkImage DWORD GetEmptyPosition(); // 빈 마크 위치를 얻는다. void GetBlockCRCList(DWORD * crcList); - void GetDiffBlocks(const DWORD * crcList, std::map & mapDiffBlocks); + void GetDiffBlocks(const uint32_t* crcList, std::map & mapDiffBlocks); private: enum diff --git a/src/game/MarkManager.cpp b/src/game/MarkManager.cpp index ec468ee..7edebf0 100644 --- a/src/game/MarkManager.cpp +++ b/src/game/MarkManager.cpp @@ -262,7 +262,7 @@ void CGuildMarkManager::DeleteMark(DWORD guildID) } // SERVER -void CGuildMarkManager::GetDiffBlocks(DWORD imgIdx, const DWORD * crcList, std::map & mapDiffBlocks) +void CGuildMarkManager::GetDiffBlocks(DWORD imgIdx, const uint32_t* crcList, std::map & mapDiffBlocks) { mapDiffBlocks.clear(); diff --git a/src/game/MarkManager.h b/src/game/MarkManager.h index 2ca6300..8a307ae 100644 --- a/src/game/MarkManager.h +++ b/src/game/MarkManager.h @@ -46,7 +46,7 @@ class CGuildMarkManager : public singleton void CopyMarkIdx(char * pcBuf) const; DWORD SaveMark(DWORD guildID, BYTE * pbMarkImage); void DeleteMark(DWORD guildID); - void GetDiffBlocks(DWORD imgIdx, const DWORD * crcList, std::map & mapDiffBlocks); + void GetDiffBlocks(DWORD imgIdx, const uint32_t* crcList, std::map & mapDiffBlocks); // CLIENT bool SaveBlockFromCompressedData(DWORD imgIdx, DWORD idBlock, const BYTE * pbBlock, DWORD dwSize); diff --git a/src/game/db.cpp b/src/game/db.cpp index 6d6eafc..03a3c47 100644 --- a/src/game/db.cpp +++ b/src/game/db.cpp @@ -499,7 +499,7 @@ void DBManager::SendAuthLogin(LPDESC d) SendLoginPing(r.login); } -void DBManager::LoginPrepare(BYTE bBillType, DWORD dwBillID, long lRemainSecs, LPDESC d, DWORD * pdwClientKey, int * paiPremiumTimes) +void DBManager::LoginPrepare(BYTE bBillType, DWORD dwBillID, long lRemainSecs, LPDESC d, uint32_t * pdwClientKey, int * paiPremiumTimes) { const TAccountTable & r = d->GetAccountTable(); diff --git a/src/game/db.h b/src/game/db.h index 145d1b8..30edfc7 100644 --- a/src/game/db.h +++ b/src/game/db.h @@ -97,7 +97,7 @@ class DBManager : public singleton void SendMoneyLog(BYTE type, DWORD vnum, int gold); - void LoginPrepare(BYTE bBillType, DWORD dwBillID, long lRemainSecs, LPDESC d, DWORD * pdwClientKey, int * paiPremiumTimes = NULL); + void LoginPrepare(BYTE bBillType, DWORD dwBillID, long lRemainSecs, LPDESC d, uint32_t * pdwClientKey, int * paiPremiumTimes = NULL); void SendAuthLogin(LPDESC d); void SendLoginPing(const char * c_pszLogin); diff --git a/src/game/input.cpp b/src/game/input.cpp index bb964ef..c08b66a 100644 --- a/src/game/input.cpp +++ b/src/game/input.cpp @@ -90,6 +90,8 @@ bool CInputProcessor::Process(LPDESC lpDesc, const void * c_pvOrig, int iBytes, return true; } + sys_log(0, "PACKET %d (%s)", bHeader, c_pszName); + if (m_iBufferLeft < iPacketLen) return true; diff --git a/src/game/login_data.cpp b/src/game/login_data.cpp index 30a80c9..6203db0 100644 --- a/src/game/login_data.cpp +++ b/src/game/login_data.cpp @@ -19,22 +19,22 @@ CLoginData::CLoginData() memset(m_aiPremiumTimes, 0, sizeof(m_aiPremiumTimes)); } -void CLoginData::SetClientKey(const DWORD * c_pdwClientKey) +void CLoginData::SetClientKey(const uint32_t * c_pdwClientKey) { - thecore_memcpy(&m_adwClientKey, c_pdwClientKey, sizeof(DWORD) * 4); + thecore_memcpy(&m_adwClientKey, c_pdwClientKey, sizeof(uint32_t) * 4); } -const DWORD * CLoginData::GetClientKey() +const uint32_t* CLoginData::GetClientKey() { return &m_adwClientKey[0]; } -void CLoginData::SetKey(DWORD dwKey) +void CLoginData::SetKey(uint32_t dwKey) { m_dwKey = dwKey; } -DWORD CLoginData::GetKey() +uint32_t CLoginData::GetKey() { return m_dwKey; } @@ -44,12 +44,12 @@ void CLoginData::SetBillType(BYTE bType) m_bBillType = bType; } -DWORD CLoginData::GetBillID() +uint32_t CLoginData::GetBillID() { return m_dwBillID; } -void CLoginData::SetBillID(DWORD dwID) +void CLoginData::SetBillID(uint32_t dwID) { m_dwBillID = dwID; } @@ -59,12 +59,12 @@ BYTE CLoginData::GetBillType() return m_bBillType; } -void CLoginData::SetConnectedPeerHandle(DWORD dwHandle) +void CLoginData::SetConnectedPeerHandle(uint32_t dwHandle) { m_dwConnectedPeerHandle = dwHandle; } -DWORD CLoginData::GetConnectedPeerHandle() +uint32_t CLoginData::GetConnectedPeerHandle() { return m_dwConnectedPeerHandle; } @@ -74,7 +74,7 @@ void CLoginData::SetLogonTime() m_dwLogonTime = get_dword_time(); } -DWORD CLoginData::GetLogonTime() +uint32_t CLoginData::GetLogonTime() { return m_dwLogonTime; } diff --git a/src/game/login_data.h b/src/game/login_data.h index 0fdf031..f8d9e14 100644 --- a/src/game/login_data.h +++ b/src/game/login_data.h @@ -6,26 +6,26 @@ class CLoginData public: CLoginData(); - void SetClientKey(const DWORD * c_pdwClientKey); + void SetClientKey(const uint32_t * c_pdwClientKey); - const DWORD * GetClientKey(); - void SetKey(DWORD dwKey); - DWORD GetKey(); + const uint32_t * GetClientKey(); + void SetKey(uint32_t dwKey); + uint32_t GetKey(); void SetLogin(const char * c_pszLogin); const char * GetLogin(); void SetBillType(BYTE bType); - DWORD GetBillID(); + uint32_t GetBillID(); - void SetBillID(DWORD dwID); + void SetBillID(uint32_t dwID); BYTE GetBillType(); - void SetConnectedPeerHandle(DWORD dwHandle); - DWORD GetConnectedPeerHandle(); + void SetConnectedPeerHandle(uint32_t dwHandle); + uint32_t GetConnectedPeerHandle(); void SetLogonTime(); - DWORD GetLogonTime(); + uint32_t GetLogonTime(); void SetIP(const char * c_pszIP); const char * GetIP(); @@ -40,17 +40,17 @@ class CLoginData bool IsDeleted(); void SetPremium(int * paiPremiumTimes); - int GetPremium(BYTE type); + int GetPremium(BYTE type); int * GetPremiumPtr(); private: - DWORD m_dwKey; - DWORD m_adwClientKey[4]; - BYTE m_bBillType; - DWORD m_dwBillID; - DWORD m_dwConnectedPeerHandle; - DWORD m_dwLogonTime; + uint32_t m_dwKey; + uint32_t m_adwClientKey[4]; + uint8_t m_bBillType; + uint32_t m_dwBillID; + uint32_t m_dwConnectedPeerHandle; + uint32_t m_dwLogonTime; long m_lRemainSecs; char m_szIP[MAX_HOST_LENGTH+1]; bool m_bBilling;