metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some small fixes

Browse Source
This commit is contained in:
d1str4ught
2025-08-22 19:57:33 +02:00
parent 71927742e7
commit 37561f1cd7
9 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/MarkImage.cpp
View File

@@ -198,7 +198,7 @@ DWORD CGuildMarkImage::GetEmptyPosition()
return INVALID_MARK_POSITION; return INVALID_MARK_POSITION;
} }
void CGuildMarkImage::GetDiffBlocks(const DWORD * crcList, std::map<BYTE, const SGuildMarkBlock *> & mapDiffBlocks) void CGuildMarkImage::GetDiffBlocks(const uint32_t* crcList, std::map<BYTE, const SGuildMarkBlock *> & mapDiffBlocks)
{ {
BYTE posBlock = 0; BYTE posBlock = 0;

2
src/game/MarkImage.h
View File

@@ -91,7 +91,7 @@ class CGuildMarkImage
DWORD GetEmptyPosition(); // 빈 마크 위치를 얻는다. DWORD GetEmptyPosition(); // 빈 마크 위치를 얻는다.
void GetBlockCRCList(DWORD * crcList); void GetBlockCRCList(DWORD * crcList);
void GetDiffBlocks(const DWORD * crcList, std::map<BYTE, const SGuildMarkBlock *> & mapDiffBlocks); void GetDiffBlocks(const uint32_t* crcList, std::map<BYTE, const SGuildMarkBlock *> & mapDiffBlocks);
private: private:
enum enum

2
src/game/MarkManager.cpp
View File

@@ -262,7 +262,7 @@ void CGuildMarkManager::DeleteMark(DWORD guildID)
} }
// SERVER // SERVER
void CGuildMarkManager::GetDiffBlocks(DWORD imgIdx, const DWORD * crcList, std::map<BYTE, const SGuildMarkBlock *> & mapDiffBlocks) void CGuildMarkManager::GetDiffBlocks(DWORD imgIdx, const uint32_t* crcList, std::map<BYTE, const SGuildMarkBlock *> & mapDiffBlocks)
{ {
mapDiffBlocks.clear(); mapDiffBlocks.clear();

2
src/game/MarkManager.h
View File

@@ -46,7 +46,7 @@ class CGuildMarkManager : public singleton<CGuildMarkManager>
void CopyMarkIdx(char * pcBuf) const; void CopyMarkIdx(char * pcBuf) const;
DWORD SaveMark(DWORD guildID, BYTE * pbMarkImage); DWORD SaveMark(DWORD guildID, BYTE * pbMarkImage);
void DeleteMark(DWORD guildID); void DeleteMark(DWORD guildID);
void GetDiffBlocks(DWORD imgIdx, const DWORD * crcList, std::map<BYTE, const SGuildMarkBlock *> & mapDiffBlocks); void GetDiffBlocks(DWORD imgIdx, const uint32_t* crcList, std::map<BYTE, const SGuildMarkBlock *> & mapDiffBlocks);
// CLIENT // CLIENT
bool SaveBlockFromCompressedData(DWORD imgIdx, DWORD idBlock, const BYTE * pbBlock, DWORD dwSize); bool SaveBlockFromCompressedData(DWORD imgIdx, DWORD idBlock, const BYTE * pbBlock, DWORD dwSize);

2
src/game/db.cpp
View File

@@ -499,7 +499,7 @@ void DBManager::SendAuthLogin(LPDESC d)
SendLoginPing(r.login); 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(); const TAccountTable & r = d->GetAccountTable();

2
src/game/db.h
View File

@@ -97,7 +97,7 @@ class DBManager : public singleton<DBManager>
void SendMoneyLog(BYTE type, DWORD vnum, int gold); 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 SendAuthLogin(LPDESC d);
void SendLoginPing(const char * c_pszLogin); void SendLoginPing(const char * c_pszLogin);

2
src/game/input.cpp
View File

@@ -90,6 +90,8 @@ bool CInputProcessor::Process(LPDESC lpDesc, const void * c_pvOrig, int iBytes,
return true; return true;
} }
sys_log(0, "PACKET %d (%s)", bHeader, c_pszName);
if (m_iBufferLeft < iPacketLen) if (m_iBufferLeft < iPacketLen)
return true; return true;

20
src/game/login_data.cpp
View File

@@ -19,22 +19,22 @@ CLoginData::CLoginData()
memset(m_aiPremiumTimes, 0, sizeof(m_aiPremiumTimes)); 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]; return &m_adwClientKey[0];
} }
void CLoginData::SetKey(DWORD dwKey) void CLoginData::SetKey(uint32_t dwKey)
{ {
m_dwKey = dwKey; m_dwKey = dwKey;
} }
DWORD CLoginData::GetKey() uint32_t CLoginData::GetKey()
{ {
return m_dwKey; return m_dwKey;
} }
@@ -44,12 +44,12 @@ void CLoginData::SetBillType(BYTE bType)
m_bBillType = bType; m_bBillType = bType;
} }
DWORD CLoginData::GetBillID() uint32_t CLoginData::GetBillID()
{ {
return m_dwBillID; return m_dwBillID;
} }
void CLoginData::SetBillID(DWORD dwID) void CLoginData::SetBillID(uint32_t dwID)
{ {
m_dwBillID = dwID; m_dwBillID = dwID;
} }
@@ -59,12 +59,12 @@ BYTE CLoginData::GetBillType()
return m_bBillType; return m_bBillType;
} }
void CLoginData::SetConnectedPeerHandle(DWORD dwHandle) void CLoginData::SetConnectedPeerHandle(uint32_t dwHandle)
{ {
m_dwConnectedPeerHandle = dwHandle; m_dwConnectedPeerHandle = dwHandle;
} }
DWORD CLoginData::GetConnectedPeerHandle() uint32_t CLoginData::GetConnectedPeerHandle()
{ {
return m_dwConnectedPeerHandle; return m_dwConnectedPeerHandle;
} }
@@ -74,7 +74,7 @@ void CLoginData::SetLogonTime()
m_dwLogonTime = get_dword_time(); m_dwLogonTime = get_dword_time();
} }
DWORD CLoginData::GetLogonTime() uint32_t CLoginData::GetLogonTime()
{ {
return m_dwLogonTime; return m_dwLogonTime;
} }

32
src/game/login_data.h
View File

@@ -6,26 +6,26 @@ class CLoginData
public: public:
CLoginData(); CLoginData();
void SetClientKey(const DWORD * c_pdwClientKey); void SetClientKey(const uint32_t * c_pdwClientKey);
const DWORD * GetClientKey(); const uint32_t * GetClientKey();
void SetKey(DWORD dwKey); void SetKey(uint32_t dwKey);
DWORD GetKey(); uint32_t GetKey();
void SetLogin(const char * c_pszLogin); void SetLogin(const char * c_pszLogin);
const char * GetLogin(); const char * GetLogin();
void SetBillType(BYTE bType); void SetBillType(BYTE bType);
DWORD GetBillID(); uint32_t GetBillID();
void SetBillID(DWORD dwID); void SetBillID(uint32_t dwID);
BYTE GetBillType(); BYTE GetBillType();
void SetConnectedPeerHandle(DWORD dwHandle); void SetConnectedPeerHandle(uint32_t dwHandle);
DWORD GetConnectedPeerHandle(); uint32_t GetConnectedPeerHandle();
void SetLogonTime(); void SetLogonTime();
DWORD GetLogonTime(); uint32_t GetLogonTime();
void SetIP(const char * c_pszIP); void SetIP(const char * c_pszIP);
const char * GetIP(); const char * GetIP();
@@ -40,17 +40,17 @@ class CLoginData
bool IsDeleted(); bool IsDeleted();
void SetPremium(int * paiPremiumTimes); void SetPremium(int * paiPremiumTimes);
int GetPremium(BYTE type); int GetPremium(BYTE type);
int * GetPremiumPtr(); int * GetPremiumPtr();
private: private:
DWORD m_dwKey; uint32_t m_dwKey;
DWORD m_adwClientKey[4]; uint32_t m_adwClientKey[4];
BYTE m_bBillType; uint8_t m_bBillType;
DWORD m_dwBillID; uint32_t m_dwBillID;
DWORD m_dwConnectedPeerHandle; uint32_t m_dwConnectedPeerHandle;
DWORD m_dwLogonTime; uint32_t m_dwLogonTime;
long m_lRemainSecs; long m_lRemainSecs;
char m_szIP[MAX_HOST_LENGTH+1]; char m_szIP[MAX_HOST_LENGTH+1];
bool m_bBilling; bool m_bBilling;