From fb64ecafe7eda4d8c738f0ef1f4ba9a45b67bf8a Mon Sep 17 00:00:00 2001 From: Exynox Date: Mon, 11 Mar 2024 18:07:11 +0200 Subject: [PATCH] Implemented official level update fix --- src/UserInterface/InstanceBaseEffect.cpp | 2 + .../PythonNetworkStreamPhaseGame.cpp | 6 +++ src/UserInterface/UserInterface.rc | 44 ++++++++++++------- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/UserInterface/InstanceBaseEffect.cpp b/src/UserInterface/InstanceBaseEffect.cpp index 2e28c8a9..52390165 100644 --- a/src/UserInterface/InstanceBaseEffect.cpp +++ b/src/UserInterface/InstanceBaseEffect.cpp @@ -656,6 +656,8 @@ void CInstanceBase::UpdateTextTailLevel(DWORD level) //static D3DXCOLOR s_kLevelColor = D3DXCOLOR(119.0f/255.0f, 246.0f/255.0f, 168.0f/255.0f, 1.0f); static D3DXCOLOR s_kLevelColor = D3DXCOLOR(152.0f/255.0f, 255.0f/255.0f, 51.0f/255.0f, 1.0f); + m_dwLevel = level; + char szText[256]; sprintf(szText, "Lv %d", level); CPythonTextTail::Instance().AttachLevel(GetVirtualID(), szText, s_kLevelColor); diff --git a/src/UserInterface/PythonNetworkStreamPhaseGame.cpp b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp index f779d7a8..7617e2df 100644 --- a/src/UserInterface/PythonNetworkStreamPhaseGame.cpp +++ b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp @@ -1524,6 +1524,12 @@ bool CPythonNetworkStream::RecvPointChange() } } } + else if (POINT_LEVEL == PointChange.Type) + { + CInstanceBase* pOtherInstance = CPythonCharacterManager::Instance().GetInstancePtr(PointChange.dwVID); + if (pOtherInstance) + pOtherInstance->UpdateTextTailLevel(PointChange.value); + } return true; } diff --git a/src/UserInterface/UserInterface.rc b/src/UserInterface/UserInterface.rc index 6f47890e..65044e5e 100644 --- a/src/UserInterface/UserInterface.rc +++ b/src/UserInterface/UserInterface.rc @@ -66,19 +66,31 @@ END // Cursor // -IDC_CURSOR_NORMAL CURSOR "Cursors\\cursor.cur" -IDC_CURSOR_CHAIR CURSOR "Cursors\\cursor_chair.cur" -IDC_CURSOR_DOOR CURSOR "Cursors\\cursor_door.cur" -IDC_CURSOR_NO CURSOR "Cursors\\cursor_no.cur" -IDC_CURSOR_PICK CURSOR "Cursors\\cursor_pick.cur" -IDC_CURSOR_TALK CURSOR "Cursors\\cursor_talk.cur" -IDC_CURSOR_ATTACK CURSOR "Cursors\\cursor_attack.cur" -IDC_CURSOR_BUY CURSOR "Cursors\\cursor_buy.cur" -IDC_CURSOR_SELL CURSOR "Cursors\\cursor_sell.cur" +IDC_CURSOR_NORMAL CURSOR "Cursors\\cursor.cur" + +IDC_CURSOR_CHAIR CURSOR "Cursors\\cursor_chair.cur" + +IDC_CURSOR_DOOR CURSOR "Cursors\\cursor_door.cur" + +IDC_CURSOR_NO CURSOR "Cursors\\cursor_no.cur" + +IDC_CURSOR_PICK CURSOR "Cursors\\cursor_pick.cur" + +IDC_CURSOR_TALK CURSOR "Cursors\\cursor_talk.cur" + +IDC_CURSOR_ATTACK CURSOR "Cursors\\cursor_attack.cur" + +IDC_CURSOR_BUY CURSOR "Cursors\\cursor_buy.cur" + +IDC_CURSOR_SELL CURSOR "Cursors\\cursor_sell.cur" + IDC_CURSOR_CAMERA_ROTATE CURSOR "Cursors\\cursor_camera_rotate.cur" -IDC_CURSOR_HSIZE CURSOR "Cursors\\cursor_hsize.cur" -IDC_CURSOR_VSIZE CURSOR "Cursors\\cursor_vsize.cur" -IDC_CURSOR_HVSIZE CURSOR "Cursors\\cursor_hvsize.cur" + +IDC_CURSOR_HSIZE CURSOR "Cursors\\cursor_hsize.cur" + +IDC_CURSOR_VSIZE CURSOR "Cursors\\cursor_vsize.cur" + +IDC_CURSOR_HVSIZE CURSOR "Cursors\\cursor_hvsize.cur" ///////////////////////////////////////////////////////////////////////////// @@ -114,8 +126,8 @@ IDI_METIN2 ICON "metin2.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,2,2,0 - PRODUCTVERSION 0,2,2,0 + FILEVERSION 0,2,3,0 + PRODUCTVERSION 0,2,3,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -132,12 +144,12 @@ BEGIN BEGIN VALUE "CompanyName", "The Old Metin2 Project" VALUE "FileDescription", "The Metin2 Client" - VALUE "FileVersion", "0.2.2.0" + VALUE "FileVersion", "0.2.3.0" VALUE "InternalName", "Metin2Client" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "Metin2.exe" VALUE "ProductName", "Metin2Client" - VALUE "ProductVersion", "0.2.2.0" + VALUE "ProductVersion", "0.2.3.0" END END BLOCK "VarFileInfo"