From 95b0f636221c2cf1ffc85448c3ead147d2476214 Mon Sep 17 00:00:00 2001 From: Ulukyn Date: Sun, 29 Mar 2020 01:39:52 +0100 Subject: [PATCH] Fixed: hide RP-PVP tags if player are not tagged --- .../src/interface_v3/group_in_scene_user_info.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp index 46df394ad..f6ddc09fb 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp +++ b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp @@ -461,16 +461,22 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity) if (rpTags) { CPlayerCL * pPlayer = dynamic_cast(entity); - CViewBitmap *rp1 = dynamic_cast(leftGroup->getView ("rp_logo_1")); - CViewBitmap *rp2 = dynamic_cast(leftGroup->getView ("rp_logo_2")); - CViewBitmap *rp3 = dynamic_cast(leftGroup->getView ("rp_logo_3")); - CViewBitmap *rp4 = dynamic_cast(leftGroup->getView ("rp_logo_4")); + CViewBitmap *rp1 = dynamic_cast(info->getView ("rp_logo_1")); + CViewBitmap *rp2 = dynamic_cast(info->getView ("rp_logo_2")); + CViewBitmap *rp3 = dynamic_cast(info->getView ("rp_logo_3")); + CViewBitmap *rp4 = dynamic_cast(info->getView ("rp_logo_4")); if (entityTag1.toString() == "_") entityTag1.clear(); if (entityTag2.toString() == "_") entityTag2.clear(); if (entityTag3.toString() == "_") entityTag3.clear(); if (entityTag4.toString() == "_") entityTag4.clear(); + if (pPlayer && !(pPlayer->getPvpMode() & PVP_MODE::PvpFaction)) + { + entityTag3.clear(); + entityTag4.clear(); + } + if (rp1) rp1->setTexture(entityTag1.toString()); if (rp2) rp2->setTexture(entityTag2.toString()); if (rp3) rp3->setTexture(entityTag3.toString());