mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-18 22:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GUI errors on broken entities with no icons. Delete some bogus icon sheet references.

Browse Source 
This was SVN commit r7905.
This commit is contained in:
Ykkrosh
2010-08-11 10:54:08 +00:00
parent b2c06651d9
commit 0dc50ea1cd
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/session_new/selection_details.js
+10 -2
View File
@@ -111,8 +111,16 @@ function displayGeneralInfo(playerState, entState, template)
}
// Icon
getGUIObjectByName("sdIconImage").sprite = template.icon_sheet;
getGUIObjectByName("sdIconImage").cell_id = template.icon_cell;
if (template.icon_sheet && typeof template.icon_cell != "undefined")
{
getGUIObjectByName("sdIconImage").sprite = template.icon_sheet;
getGUIObjectByName("sdIconImage").cell_id = template.icon_cell;
}
else
{
// TODO: we should require all entities to have icons, so this case never occurs
getGUIObjectByName("sdIconImage").sprite = "bkFillBlack";
}
getGUIObjectByName("sdIcon").tooltip = iconTooltip;
//getGUIObjectByName("sdIconOutline"); // Need to change color of icon outline with the playerColor
binaries/data/mods/public/simulation/templates/template_structure.xml
-1
View File
@@ -2,7 +2,6 @@
<Entity parent="template_entity_full">
<Identity>
<GenericName>Structure</GenericName>
<IconSheet>PortraitSheet</IconSheet>
</Identity>
<BuildRestrictions>
<PlacementType>standard</PlacementType>
binaries/data/mods/public/simulation/templates/template_unit.xml
-1
View File
@@ -2,7 +2,6 @@
<Entity parent="template_entity_full">
<Identity>
<GenericName>Unit</GenericName>
<IconSheet>PortraitSheet</IconSheet>
</Identity>
<Minimap>
<Type>unit</Type>