Added civ icon

Fixed Settings Dialog graphics

This was SVN commit r8202.
This commit is contained in:
WhiteTreePaladin 2010-09-28 14:58:14 +00:00
parent 7b419170ad
commit 93e81319e8
4 changed files with 31 additions and 10 deletions

View File

@ -66,6 +66,8 @@ function init(initData, hotloadData)
g_Players = getPlayerData(null);
}
getGUIObjectByName("civIcon").sprite = g_Players[Engine.GetPlayerID()].civ+"Icon";
cacheMenuObjects();
onSimulationUpdate();

View File

@ -178,13 +178,13 @@
<!-- Settings Window -->
<!-- ================================ ================================ -->
<object name="settingsWindow"
style="wheatWindow"
style="sessionPanel"
type="image"
size="50%-180 50%-200 50%+180 50%+50"
hidden="true"
z="30"
>
<object name="settingsTitleBar" style="wheatWindowTitleBar" type="text">Settings</object>
<object size="50%-100 -16 50%+100 16" name="settingsTitleBar" style="wheatWindowTitleBar" type="text">Settings</object>
<object name="settingsOptions"
size="30 30 100%-30 150"
@ -235,7 +235,7 @@
<object name="topPanel"
type="image"
style="sessionPanel"
size="0 0 100% 28"
size="-3 0 100%+3 26"
>
<!-- ================================ ================================ -->
<!-- Player resource bar -->
@ -275,6 +275,11 @@
</object>
</object>
<!-- ================================ ================================ -->
<!-- Civ Icon -->
<!-- ================================ ================================ -->
<object size="50%-32 -20 50%+32 44" name="civIcon" type="image"/>
<!-- ================================ ================================ -->
<!-- Phase -->
<!-- ================================ ================================ -->

View File

@ -2,9 +2,24 @@
<sprites>
<sprite name="heleIcon">
<image
texture="session/portraits/emblems/emblem_hellenes.png"
cell_size="72 72"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="celtIcon">->
<image
texture="session/portraits/emblems/emblem_celts.png"
cell_size="72 72"
size="0 0 100% 100%"
/>
</sprite>
<!-- NEED TO MORE FORMATIONS TO A MORE APPROPRIATE PLACE -->
<sprite name="formation">
<!-- (currently this is all a hack - need proper textures) -->
<image
texture="session/icons/sheets/formation_select.png"
cell_size="64 64"
@ -14,7 +29,6 @@
<!-- NEED TO MORE FORMATIONS TO A MORE APPROPRIATE PLACE -->
<sprite name="formation_disabled">
<!-- (currently this is all a hack - need proper textures) -->
<image
texture="session/icons/sheets/formation_nonselect.png"
cell_size="64 64"

View File

@ -132,32 +132,32 @@
<style name="settingsText"
font="serif-16"
textcolor="0 0 0"
textcolor="white"
text_align="right"
text_valign="center"
/>
<style name="leftAlignedText"
textcolor="0 0 0"
textcolor="white"
text_align="left"
text_valign="center"
/>
<style name="rightAlignedText"
textcolor="255 255 255"
textcolor="white"
text_align="right"
text_valign="top"
/>
<style name="centeredText"
textcolor="0 0 0"
textcolor="black"
text_align="center"
text_valign="center"
/>
<style name="largeBoldCenteredText"
font="serif-bold-18"
textcolor="0 0 0"
textcolor="black"
text_align="center"
text_valign="center"
/>