From 92358e6d2e04c6399a9368d2a2df0b81b5ec5e60 Mon Sep 17 00:00:00 2001 From: Raylde <50953519+Raylde@users.noreply.github.com> Date: Sun, 24 Sep 2023 00:33:31 +0200 Subject: [PATCH 1/2] revert change of naword to nword to fix foundation issue --- src/network/send.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/send.h b/src/network/send.h index 9628fdce3..8383aee4d 100644 --- a/src/network/send.h +++ b/src/network/send.h @@ -1790,7 +1790,7 @@ class PacketHouseDesign : public PacketSend private: struct StairData { - naword m_id; + nword m_id; byte m_x; byte m_y; byte m_z; From 7489a103474f9a9071312d9c67aff7f0f56e085a Mon Sep 17 00:00:00 2001 From: Raylde <50953519+Raylde@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:25:47 +0100 Subject: [PATCH 2/2] Fix Crafting trigger making the skill crafting become active with the menu open --- src/game/clients/CClientUse.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/clients/CClientUse.cpp b/src/game/clients/CClientUse.cpp index b9b934500..5f62d7e90 100644 --- a/src/game/clients/CClientUse.cpp +++ b/src/game/clients/CClientUse.cpp @@ -645,7 +645,7 @@ bool CClient::Skill_Menu(SKILL_TYPE skill, lpctstr skillmenu, ITEMID_TYPE itemus Args.m_VarsLocal.SetNumNew("ItemUsed", itemused); if (IsTrigUsed(TRIGGER_SKILLMENU)) { - if (m_pChar->Skill_OnCharTrigger(skill, CTRIG_SkillMenu, &Args) == TRIGRET_RET_TRUE) + if (m_pChar->OnTrigger(CTRIG_SkillMenu, m_pChar, &Args) == TRIGRET_RET_TRUE ) return true; skillmenu = Args.m_VarsLocal.GetKeyStr("Skillmenu", false);