From 95982432233ea34cd7ddb1b7b34fa30c40db0c50 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 18 Oct 2010 20:31:19 +0200
Subject: [PATCH] Changed: #1135 Merge changes from Ryzom patch 1.10

---
 code/ryzom/client/src/entity_cl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp
index 37324e1ff..42ee1c7de 100644
--- a/code/ryzom/client/src/entity_cl.cpp
+++ b/code/ryzom/client/src/entity_cl.cpp
@@ -2514,7 +2514,7 @@ NLMISC::CRGBA	CEntityCL::getColor () const
 				if (getPvpMode()&PVP_MODE::PvpFactionFlagged || getPvpMode()&PVP_MODE::PvpChallenge)
 					return _PvpEnemyColor;
 				else
-					return CRGBA::CRGBA(min(255, _PvpEnemyColor.R+150), min(255, _PvpEnemyColor.G+150), min(255, _PvpEnemyColor.B+150),_PvpEnemyColor.A);
+					return CRGBA(min(255, _PvpEnemyColor.R+150), min(255, _PvpEnemyColor.G+150), min(255, _PvpEnemyColor.B+150),_PvpEnemyColor.A);
 			}
 		}
 		// neutral pvp
@@ -2538,7 +2538,7 @@ NLMISC::CRGBA	CEntityCL::getColor () const
 			if (getPvpMode()&PVP_MODE::PvpFactionFlagged)
 				return _PvpAllyColor;
 			else
-				return CRGBA::CRGBA(min(255, _PvpAllyColor.R+150), min(255, _PvpAllyColor.G+150), min(255, _PvpAllyColor.B+150),_PvpAllyColor.A);
+				return CRGBA(min(255, _PvpAllyColor.R+150), min(255, _PvpAllyColor.G+150), min(255, _PvpAllyColor.B+150),_PvpAllyColor.A);
 		}
 		// neutral
 		if (isInTeam())