paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

reference new rank icons

Browse Source 
This was SVN commit r9441.
This commit is contained in:
WhiteTreePaladin 2011-05-05 00:10:43 +00:00
parent 99e45311ab
commit 141cc51573
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/gui/session/selection_details.js
View File

@ -45,7 +45,7 @@ function displaySingle(entState, template)
}
// Rank
getGUIObjectByName("rankIcon").cell_id = getRankIconCellId(entState);
getGUIObjectByName("rankIcon").sprite = getRankIconSprite(entState);
// Hitpoints
var hitpoints = "";

2
binaries/data/mods/public/gui/session/session.xml
View File

@ -512,7 +512,7 @@
<!-- Big unit icon -->
<object size= "50%-48 40 50%+48 136" type="image" name="iconBorder" tooltip_style="sessionToolTip">
<object size="2 2 100%-2 100%-2" type="image" name="icon" ghost="true"/>
<object size="100%-32 0 100% 32" name="rankIcon" type="image" cell_id="-1" sprite="snIconSheetRank" ghost="true"/>
<object size="100%-32 0 100% 32" name="rankIcon" type="image" sprite="" ghost="true"/>
<object type="image" sprite="glassSquareIcon" ghost="true"/>
</object>

27
binaries/data/mods/public/gui/session/utility_functions.js
View File

@ -359,16 +359,25 @@ function getEntityRankedName(entState)
return template.name.specific;
}
function getRankIconCellId(entState)
function getRankIconSprite(entState)
{
var template = GetTemplateData(entState.template)
var rank = entState.identity.rank;
if (rank)
if (entState.identity && entState.identity.rank && entState.identity.classes)
{
if (rank == "Elite")
return 0;
else if (rank == "Advanced")
return 1;
if ("Elite" == entState.identity.rank)
{
return "stretched:session/icons/single/rank3.png";
}
else if ("Advanced" == entState.identity.rank)
{
return "stretched:session/icons/single/rank2.png";
}
else if (entState.identity.classes &&
entState.identity.classes.length &&
-1 != entState.identity.classes.indexOf("CitizenSoldier"))
{
return "stretched:session/icons/single/rank1.png";
}
}
return -1;
return "";
}