From 25d04f65bde960367d953abf83856829d57a903a Mon Sep 17 00:00:00 2001 From: Nimetu Date: Thu, 19 Sep 2019 13:07:41 +0300 Subject: [PATCH 1/2] Fixed: Inventory and npc trade items list did not show crafted item names. --HG-- branch : develop --- code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp index fe7c3b281..8a3064a12 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp @@ -100,7 +100,6 @@ void CControlSheetInfoWaiter::infoReceived() ucstring CControlSheetInfoWaiter::infoValidated() const { ucstring help; - if (CtrlSheet && !LuaMethodName.empty()) { // delegate setup of context he help ( & window ) to lua @@ -3396,6 +3395,9 @@ void CDBCtrlSheet::getContextHelp(ucstring &help) const // call lua function to update tooltip window _ItemInfoWaiter.sendRequest(); help = _ItemInfoWaiter.infoValidated(); + // its expected to get at least item name back + if (help.empty()) + help = getItemActualName(); } else if (!_ContextHelp.empty()) { From 076d4b73c19019c4ca930fa4494679e8ea55ae48 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Thu, 19 Sep 2019 14:41:13 +0300 Subject: [PATCH 2/2] Changed: Config option to disable /tar for changing compass target. --HG-- branch : develop --- code/ryzom/client/src/client_cfg.cpp | 5 +++++ code/ryzom/client/src/client_cfg.h | 3 +++ .../src/interface_v3/action_handler_game.cpp | 19 +++++++++++-------- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index 1e6bcefe3..7f0222088 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -614,6 +614,8 @@ CClientConfig::CClientConfig() MaxMapScale = 2.0f; R2EDMaxMapScale = 8.0f; + TargetChangeCompass = true; + // VERBOSES VerboseVP = false; VerboseAnimUser = false; @@ -1495,6 +1497,9 @@ void CClientConfig::setValues() READ_FLOAT_FV(MaxMapScale); READ_FLOAT_FV(R2EDMaxMapScale); + // /tar to update compass or not + READ_BOOL_FV(TargetChangeCompass); + ///////////// // SHADOWS // // Shadows : Get Shadows state diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h index af2e97bd3..7c1fa2ad6 100644 --- a/code/ryzom/client/src/client_cfg.h +++ b/code/ryzom/client/src/client_cfg.h @@ -607,6 +607,9 @@ struct CClientConfig float MaxMapScale; float R2EDMaxMapScale; + // If successfull /tar command should set compass or not + bool TargetChangeCompass; + ////////////// // VERBOSES // bool VerboseVP; diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp index 7d33b381a..33b19307f 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp @@ -2476,16 +2476,19 @@ class CAHTarget : public IActionHandler if (entity && entity->properties().selectable() && !entity->getDisplayName().empty()) { UserEntity->selection(entity->slot()); - CGroupCompas *gc = dynamic_cast(CWidgetManager::getInstance()->getElementFromId("ui:interface:compass")); - if (gc) + if (ClientCfg.TargetChangeCompass) { - CCompassTarget ct; - ct.setType(CCompassTarget::Selection); + CGroupCompas *gc = dynamic_cast(CWidgetManager::getInstance()->getElementFromId("ui:interface:compass")); + if (gc) + { + CCompassTarget ct; + ct.setType(CCompassTarget::Selection); - gc->setActive(true); - gc->setTarget(ct); - gc->blink(); - CWidgetManager::getInstance()->setTopWindow(gc); + gc->setActive(true); + gc->setTarget(ct); + gc->blink(); + CWidgetManager::getInstance()->setTopWindow(gc); + } } } else if (!quiet)