From f414e39b0b7545bcba73d74659630042f80d5794 Mon Sep 17 00:00:00 2001 From: rtw1x1 Date: Mon, 13 Oct 2025 20:34:45 +0100 Subject: [PATCH 1/2] Fix login failure. Credit @m2ciaran, @Mind Rapist --- src/game/desc.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/desc.cpp b/src/game/desc.cpp index 391f6ea..6f2a028 100644 --- a/src/game/desc.cpp +++ b/src/game/desc.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" #include "config.h" #include "utils.h" #include "desc.h" @@ -645,7 +645,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; @@ -660,13 +660,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; } @@ -690,7 +690,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) { @@ -698,7 +698,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) From 92e41829a379978c9e1fc200dceb92ff2d749474 Mon Sep 17 00:00:00 2001 From: rtw1x1 Date: Mon, 13 Oct 2025 20:37:00 +0100 Subject: [PATCH 2/2] Fix login failure. Credits @m2ciaran, @Mind Rapist --- src/game/desc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/desc.h b/src/game/desc.h index 65a4829..a1342cf 100644 --- a/src/game/desc.h +++ b/src/game/desc.h @@ -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; }