group #defines at top of file and use better names

This commit is contained in:
Yann Dirson 2005-02-18 20:48:59 +00:00
parent b21b4956f7
commit 1aaf2d1971

View file

@ -9,11 +9,6 @@ height=1
[theme]
name=Default
[resolution]
id=1024x768
width=1024
height=768
#define FONT_NORMAL
14 #enddef
#define FONT_SMALL
@ -21,6 +16,18 @@ height=768
#define FONT_TINY
10 #enddef
#define FONT320_NORMAL
8 #enddef
#define FONT320_SMALL
6 #enddef
#define FONT320_TINY
6 #enddef
[resolution]
id=1024x768
width=1024
height=768
[screen]
# this is only useful as a ref for other rects
id=screen
@ -472,13 +479,6 @@ width=320
height=240
inherits=800x600
#define FONT_NORMAL2
8 #enddef
#define FONT_SMALL2
6 #enddef
#define FONT_TINY2
6 #enddef
[change]
id=top-panel
rect==,=,=,+13
@ -523,7 +523,7 @@ inherits=800x600
[menu]
id=zoom-in
title=+
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
items=zoomin
ref=top-panel
rect=980,=,+6,=
@ -533,7 +533,7 @@ inherits=800x600
[menu]
id=zoom-out
title=-
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
items=zoomout
rect==+11,=,+6,=
xanchor=right
@ -577,12 +577,12 @@ inherits=800x600
[change]
id=label-hp
font_size={FONT_TINY2}
font_size={FONT320_TINY}
rect==+40,=+93,+12,+8
[/change]
[change]
id=label-xp
font_size={FONT_TINY2}
font_size={FONT320_TINY}
ref=label-hp
rect==,+0,=,+8
[/change]
@ -620,37 +620,37 @@ inherits=800x600
[change]
id=turn
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect=+4,=,+58,+8
[/change]
[change]
id=gold
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect=+4,=,+58,+8
[/change]
[change]
id=villages
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect=+4,=,+58,+8
[/change]
[change]
id=num-units
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect=+4,=,+58,+8
[/change]
[change]
id=status-upkeep
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect=+4,=,+58,+8
[/change]
[change]
id=status-income
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect=+4,=,+58,+8
[/change]
[change]
id=status-position
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect=+5,=,+130,+8
[/change]
[change]
@ -663,59 +663,59 @@ inherits=800x600
[/change]
[change]
id=unit-description
font_size={FONT_NORMAL2}
font_size={FONT320_NORMAL}
rect==+6,=,=-2,+10
[/change]
[change]
id=unit-type
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect==,+0,=,+8
[/change]
[change]
id=unit-level
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect==,+0,=,+8
[/change]
[change]
id=unit-alignment
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect==,+0,=,+8
[/change]
[change]
id=unit-traits
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect==,+0,=,+8
[/change]
[change]
id=unit-abilities
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect==,+0,=,+8
[/change]
[change]
id=unit-moves
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect==,+0,=,+8
[/change]
[change]
id=unit-hp
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
ref=label-hp
rect=+0,=,1022,+8
[/change]
[change]
id=unit-xp
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
ref=label-xp
rect=+0,=,1022,+8
[/change]
[change]
id=unit-weapons
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
rect==,+0,=,768
[/change]
[change]
id=unit-status
font_size={FONT_SMALL2}
font_size={FONT320_SMALL}
ref=label-xp
rect==,+2,=,+8
[/change]