Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1135 Merge changes from Ryzom patch 1.10

Browse source
This commit is contained in:
kervala 2010-10-18 20:31:19 +02:00
parent 070ffa2d32
commit 9598243223
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/entity_cl.cpp
View file

@ -2514,7 +2514,7 @@ NLMISC::CRGBA CEntityCL::getColor () const
if (getPvpMode()&PVP_MODE::PvpFactionFlagged || getPvpMode()&PVP_MODE::PvpChallenge) if (getPvpMode()&PVP_MODE::PvpFactionFlagged || getPvpMode()&PVP_MODE::PvpChallenge)
return _PvpEnemyColor; return _PvpEnemyColor;
else 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 // neutral pvp
@ -2538,7 +2538,7 @@ NLMISC::CRGBA CEntityCL::getColor () const
if (getPvpMode()&PVP_MODE::PvpFactionFlagged) if (getPvpMode()&PVP_MODE::PvpFactionFlagged)
return _PvpAllyColor; return _PvpAllyColor;
else 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 // neutral
if (isInTeam()) if (isInTeam())