From 7d1534fb314d3035f96e10d8205bdea50103ad25 Mon Sep 17 00:00:00 2001 From: Nuno Date: Mon, 17 May 2021 21:13:33 +0200 Subject: [PATCH 1/3] Fix bad commit --- code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp index 99e7eff73..053ba4c67 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp @@ -1139,10 +1139,8 @@ void CDBCtrlSheet::infoReceived() const CSBrickSheet *brick = pBM->getBrick(itemInfo->Enchantment.Bricks[i]); if (brick) { - if (!brick->isRoot() && !brick->isCredit() && !brick->isParameter()) if (brick->BrickFamily == BRICK_FAMILIES::BSGMCB) // Boost of Allegories, use it as boost icon { - if (!haveRoot) _BoostIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIcon()), brick->IconColor)); rVR.getTextureSizeFromId(_BoostIcons.back().TextureId, _BoostIcons.back().IconW, _BoostIcons.back().IconH); } From 3362afaa4da8d65ca64b6d3de92c367a23a55b2c Mon Sep 17 00:00:00 2001 From: Nimetu Date: Wed, 19 May 2021 20:17:48 +0300 Subject: [PATCH 2/3] Fix mission give item window sometimes not appearing. --- code/ryzom/client/src/user_entity.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp index 8be4c8101..0ddd61c41 100644 --- a/code/ryzom/client/src/user_entity.cpp +++ b/code/ryzom/client/src/user_entity.cpp @@ -2674,17 +2674,6 @@ void CUserEntity::selection(const CLFECOMMON::TCLEntityId &slot) // virtual { playerGiftNeeded->setValue32(0); } - // - missionOption = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%d:TITLE", (int) k), false); - if (missionOption) - { - missionOption->setValue32(0); - } - playerGiftNeeded = NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%d:PLAYER_GIFT_NEEDED", (int) k), false); - if (playerGiftNeeded) - { - playerGiftNeeded->setValue32(0); - } } /* TODO ULU : Add RP tags */ From a28bda89e6985b5a5052a2221c905c8429ae3f32 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Fri, 21 May 2021 00:41:01 +0300 Subject: [PATCH 3/3] Fix issue with single enchant icon on jewels not showing --- .../client/src/interface_v3/dbctrl_sheet.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp index 603d0aec6..10c6ff102 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp @@ -1127,10 +1127,20 @@ void CDBCtrlSheet::infoReceived() } else if (!brick->isRoot() && !brick->isCredit() && !brick->isParameter()) { - if (!haveRoot && !brick->getIconBack().empty()) + if (!haveRoot) { - _EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIconBack()), brick->IconBackColor)); - rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH); + haveRoot = true; + if (brick->getIconBack().empty()) + { + // use blank texture with size from main icon + _EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName("blank.tga"), NLMISC::CRGBA::White)); + rVR.getTextureSizeFromId(rVR.getTextureIdFromName(brick->getIcon()), _EnchantIcons.back().IconW, _EnchantIcons.back().IconH); + } + else + { + _EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIconBack()), brick->IconBackColor)); + rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH); + } } _EnchantIcons.push_back(SBuffIcon(rVR.getTextureIdFromName(brick->getIcon()), brick->IconColor)); rVR.getTextureSizeFromId(_EnchantIcons.back().TextureId, _EnchantIcons.back().IconW, _EnchantIcons.back().IconH);