Merge branch 'ryzom/ui/improvements' into atys

code/ryzom/client/src/interface_v3/action_handler_debug.cpp

@@ -112,6 +112,23 @@ class CAHToggleARKPACSBorders : public IActionHandler
 };
 REGISTER_ACTION_HANDLER (CAHToggleARKPACSBorders, "ark_pacs_borders");
 
+// ***************************************************************************
+class CAHToggleFly : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
+	{
+		// Change to AI Mode.
+		if(UserControls.mode() != CUserControls::AIMode)
+			UserControls.mode(CUserControls::AIMode);
+		// Leave the AI Mode.
+		else
+			UserEntity->viewMode(UserEntity->viewMode());
+	}
+};
+// ***************************************************************************
+REGISTER_ACTION_HANDLER (CAHToggleFly, "toggle_fly");
+
+
 #if !FINAL_VERSION
 // ------------------------------------------------------------------------------------------------
 class CAHProfile : public IActionHandler
@@ -270,22 +287,6 @@ class CAHSwitchConsoleDisplay : public IActionHandler
 // ***************************************************************************
 REGISTER_ACTION_HANDLER (CAHSwitchConsoleDisplay, "switch_console_display");
 
-// ***************************************************************************
-class CAHToggleFly : public IActionHandler
-{
-	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
-	{
-		// Change to AI Mode.
-		if(UserControls.mode() != CUserControls::AIMode)
-			UserControls.mode(CUserControls::AIMode);
-		// Leave the AI Mode.
-		else
-			UserEntity->viewMode(UserEntity->viewMode());
-	}
-};
-// ***************************************************************************
-REGISTER_ACTION_HANDLER (CAHToggleFly, "toggle_fly");
-
 // ***************************************************************************
 class CAHReloadLandscapeIg : public IActionHandler
 {

code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp

@@ -463,19 +463,26 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 			//else
 			//	stringSpace += textH;
 
+			bool have2pvptags = false;
 			if (rpTags)
 			{
 				CPlayerCL * pPlayer = dynamic_cast<CPlayerCL*>(entity);
-				CViewBitmap *rp1 = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_1"));
-				CViewBitmap *rp2 = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_2"));
-				CViewBitmap *rp3 = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_3"));
-				CViewBitmap *rp4 = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_4"));
+				CViewBitmap *rp1 = dynamic_cast<CViewBitmap*>(info->getView ("rp_logo_1"));
+				CViewBitmap *rp2 = dynamic_cast<CViewBitmap*>(info->getView ("rp_logo_2"));
+				CViewBitmap *rp3 = dynamic_cast<CViewBitmap*>(info->getView ("rp_logo_3"));
+				CViewBitmap *rp4 = dynamic_cast<CViewBitmap*>(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::None))
+				{
+					entityTag1.clear();
+					entityTag2.clear();
+				}
+
 				if (rp1) rp1->setTexture(entityTag1.toString());
 				if (rp2) rp2->setTexture(entityTag2.toString());
 				if (rp3) rp3->setTexture(entityTag3.toString());
@@ -486,6 +493,8 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 				if (rp2) rp2->setActive(!entityTag2.empty());
 				if (rp3) rp3->setActive(!entityTag3.empty());
 				if (rp4) rp4->setActive(!entityTag4.empty());
+
+				have2pvptags = !entityTag1.empty() && !entityTag2.empty();
 			}
 
 			// Get the permanent content bitmap
@@ -654,6 +663,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 				}
 
 				CViewBase * pvpFactionLogo = info->getView ("pvp_faction_logo");
+				CViewBase * pvpFactionLogo2 = info->getView ("pvp_faction_logo2");
 				CViewBase * pvpOutpostLogo = info->getView ("pvp_outpost_logo");
 				CViewBase * pvpDuelLogo = info->getView ("pvp_duel_logo");
 
@@ -667,6 +677,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 					{
 						pvpFactionLogo->setActive(true);
 						CViewBitmap * pvpFactionBitmap = dynamic_cast<CViewBitmap *>(pvpFactionLogo);
+						CViewBitmap * pvpFactionBitmap2 = dynamic_cast<CViewBitmap *>(pvpFactionLogo2);
 						if( pvpFactionBitmap )
 						{
 							if (user)
@@ -714,6 +725,12 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 									pvpFactionLogo->setActive(false);
 							}
 						}
+
+						if( pvpFactionLogo && pvpFactionBitmap2 )
+						{
+							pvpFactionBitmap2->setTexture(pvpFactionBitmap->getTexture());
+							pvpFactionLogo2->setActive(have2pvptags);
+						}
 					}
 
 					if (pvpOutpostLogo)
@@ -731,13 +748,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 						else
 							pvpDuelLogo->setActive(false);
 					}
-
-				}
-				else
-				{
-					CInterfaceGroup* grp = info->getGroup("right_pvp");
-					if (grp)
-						info->delGroup(grp);
 				}
 			}