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

Merge pull request #19 from rtw1x1/main

Browse Source 
Fix Login failure. Credits @m2Ciaran, @Mind Rapist
This commit is contained in:
d1str4ught
2025-11-13 18:53:19 +01:00
committed by GitHub
parent 26094b5c95 92e41829a3
commit 08b93e2ec8
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/desc.cpp
View File

@@ -1,4 +1,4 @@
#include "stdafx.h"
#include "stdafx.h"
#include "config.h"
#include "utils.h"
#include "desc.h"
@@ -642,7 +642,7 @@ void DESC::StartHandshake(DWORD _handshake)
m_iHandshakeRetry = 0;
}
void DESC::SendHandshake(DWORD dwCurTime, long lNewDelta)
void DESC::SendHandshake(DWORD dwCurTime, int32_t lNewDelta)
{
TPacketGCHandshake pack;
@@ -657,13 +657,13 @@ void DESC::SendHandshake(DWORD dwCurTime, long lNewDelta)
m_bHandshaking = true;
}
bool DESC::HandshakeProcess(DWORD dwTime, long lDelta, bool bInfiniteRetry)
bool DESC::HandshakeProcess(DWORD dwTime, int32_t lDelta, bool bInfiniteRetry)
{
DWORD dwCurTime = get_dword_time();
if (lDelta < 0)
{
sys_err("Desc::HandshakeProcess : value error (lDelta %d, ip %s)", lDelta, m_stHost.c_str());
sys_err("Desc::HandshakeProcess : value error (lDelta %" PRId32 ", ip %s)", lDelta, m_stHost.c_str());
return false;
}
@@ -687,7 +687,7 @@ bool DESC::HandshakeProcess(DWORD dwTime, long lDelta, bool bInfiniteRetry)
return true;
}
long lNewDelta = (long) (dwCurTime - dwTime) / 2;
int32_t lNewDelta = (int32_t) (dwCurTime - dwTime) / 2;
if (lNewDelta < 0)
{
@@ -695,7 +695,7 @@ bool DESC::HandshakeProcess(DWORD dwTime, long lDelta, bool bInfiniteRetry)
lNewDelta = (dwCurTime - m_dwHandshakeSentTime) / 2;
}
sys_log(1, "Handshake: ServerTime %u dwTime %u lDelta %d SentTime %u lNewDelta %d", dwCurTime, dwTime, lDelta, m_dwHandshakeSentTime, lNewDelta);
sys_log(1, "Handshake: ServerTime %u dwTime %u lDelta %" PRId32 " SentTime %u lNewDelta %" PRId32, dwCurTime, dwTime, lDelta, m_dwHandshakeSentTime, lNewDelta);
if (!bInfiniteRetry)
if (++m_iHandshakeRetry > HANDSHAKE_RETRY_LIMIT)

6
src/game/desc.h
View File

@@ -1,4 +1,4 @@
#ifndef __INC_METIN_II_GAME_DESC_H__
#ifndef __INC_METIN_II_GAME_DESC_H__
#define __INC_METIN_II_GAME_DESC_H__
#include "constants.h"
@@ -121,8 +121,8 @@ class DESC
// 핸드쉐이크 (시간 동기화)
void StartHandshake(DWORD _dw);
void SendHandshake(DWORD dwCurTime, long lNewDelta);
bool HandshakeProcess(DWORD dwTime, long lDelta, bool bInfiniteRetry=false);
void SendHandshake(DWORD dwCurTime, int32_t lNewDelta);
bool HandshakeProcess(DWORD dwTime, int32_t lDelta, bool bInfiniteRetry=false);
bool IsHandshaking();
DWORD GetHandshake() const { return m_dwHandshake; }