From 526737092765cc4377c17786f098896203e1e2de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caner=20K=C4=B1l=C4=B1=C3=A7o=C4=9Flu?= Date: Sun, 23 Nov 2025 03:12:12 +0300 Subject: [PATCH 1/2] duplicate message deleted --- Changelog.txt | 3 +++ src/game/clients/CClientUse.cpp | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index eb6bead1f..0a35655bf 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -4077,3 +4077,6 @@ When setting a property like MORE to the a spell or skill defname, trying to rea - Changed: Object timers are now saved in worldsave files as TIMERMS, to avoid ambiguity and reliance on git build number to determine if TIMER expressed a number in seconds or milliseconds. - Changed: Added 5 seconds timeout to DNS hostname resolution at startup (avoid getting stuck when connectivity is enabled but not working). - Changed: CANMASK formatted in worldsave files as hexadecimal number, instead of decimal. + +23-11-2025, canerksk +- Changed: Duplicate message deleted. (Issue #1519). \ No newline at end of file diff --git a/src/game/clients/CClientUse.cpp b/src/game/clients/CClientUse.cpp index 4a8ce4a2d..55bd6ffb0 100644 --- a/src/game/clients/CClientUse.cpp +++ b/src/game/clients/CClientUse.cpp @@ -180,7 +180,6 @@ bool CClient::Cmd_Use_Item( CItem *pItem, bool fTestTouch, bool fScript ) SysMessageDefault(DEFMSG_ITEMUSE_LOCKED); if (!m_pChar->GetPackSafe()->ContentFindKeyFor(pItem)) // I don't have the container key { - SysMessageDefault(DEFMSG_ITEMUSE_LOCKED); SysMessageDefault(DEFMSG_LOCK_CONT_NO_KEY); if (!IsPriv(PRIV_GM)) return false; From 740add3a9e5539b7ed1a0b0b5cc084a73dfc0878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caner=20K=C4=B1l=C4=B1=C3=A7o=C4=9Flu?= Date: Tue, 25 Nov 2025 14:53:05 +0300 Subject: [PATCH 2/2] console clear/lists clear added to context menu --- Changelog.txt | 7 ++++++- src/resources/SphereSvr.rc | 2 ++ src/resources/win_resource.h | 1 + src/sphere/ntwindow.cpp | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 0a35655bf..72a760025 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -4079,4 +4079,9 @@ When setting a property like MORE to the a spell or skill defname, trying to rea - Changed: CANMASK formatted in worldsave files as hexadecimal number, instead of decimal. 23-11-2025, canerksk -- Changed: Duplicate message deleted. (Issue #1519). \ No newline at end of file +- Changed: Duplicate message deleted. (Issue #1519). + + +25-11-2025, canerksk +- Added: console clear/lists clear added to context menu (Issue #1516) + diff --git a/src/resources/SphereSvr.rc b/src/resources/SphereSvr.rc index 4d087d7d9..63470d9f8 100644 --- a/src/resources/SphereSvr.rc +++ b/src/resources/SphereSvr.rc @@ -152,6 +152,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Restore", IDM_RESTORE MENUITEM "Minimize", IDM_MINIMIZE + MENUITEM "Console Clear", IDM_CLEAR_CONSOLE MENUITEM SEPARATOR MENUITEM "Status...", IDM_STATUS MENUITEM "About...", IDR_ABOUT_BOX @@ -167,6 +168,7 @@ BEGIN MENUITEM "Copy", IDM_EDIT_COPY MENUITEM SEPARATOR MENUITEM "Resync Pause", IDM_RESYNC_PAUSE + MENUITEM "Console Clear", IDM_CLEAR_CONSOLE MENUITEM SEPARATOR MENUITEM "Status...", IDM_STATUS MENUITEM "About...", IDR_ABOUT_BOX diff --git a/src/resources/win_resource.h b/src/resources/win_resource.h index b406120f2..48c382a2b 100644 --- a/src/resources/win_resource.h +++ b/src/resources/win_resource.h @@ -29,6 +29,7 @@ #define IDC_SETUP_LOG 4023 #define IDC_SETUP_NAME 4024 #define IDM_RESYNC_PAUSE 32784 +#define IDM_CLEAR_CONSOLE 32785 // Next default values for new objects // diff --git a/src/sphere/ntwindow.cpp b/src/sphere/ntwindow.cpp index 3d90997bf..79674dff2 100644 --- a/src/sphere/ntwindow.cpp +++ b/src/sphere/ntwindow.cpp @@ -599,6 +599,9 @@ bool CNTWindow::OnCommand( WORD wNotifyCode, INT_PTR wID, HWND hwndCtl ) // SC_MINIMIZE ShowWindow(SW_HIDE); break; + case IDM_CLEAR_CONSOLE: + List_Clear(); + break; case IDM_RESTORE: // SC_RESTORE ShowWindow(SW_NORMAL);