summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2007-11-08 00:05:14 +0000
committerTim Angus <tim@ngus.net>2007-11-08 00:05:14 +0000
commit74c8d33a2b830a47c31272bcf16cbbfd404ce0e8 (patch)
treee57fc261700a619fbf9a09a589706a5165653221 /ui
parentc6a9027b7cf0d35401cae346b67ca95c5f55b4a1 (diff)
* Merge and move text paint functions into ui_shared.c
* Add aspectBias to indicate alignment on non-4:3 video modes * Add "reset <item>" script command to reset an item * Compensate for aspect ratio in lots and lots and lots of places * Release edit field focus when tabbing away * Fix infinite loop bug in text wrapping code when rect is very narrow * Mung .menu scripts to line things up correctly on non-4:3 ratios
Diffstat (limited to 'ui')
-rw-r--r--ui/connect.menu1
-rw-r--r--ui/createfavorite.menu16
-rw-r--r--ui/createserver.menu75
-rw-r--r--ui/drop.menu16
-rw-r--r--ui/error.menu12
-rw-r--r--ui/findplayer.menu27
-rw-r--r--ui/ingame.menu13
-rw-r--r--ui/ingame_game.menu123
-rw-r--r--ui/ingame_leave.menu33
-rw-r--r--ui/ingame_options.menu389
-rw-r--r--ui/joinserver.menu93
-rw-r--r--ui/loading.menu33
-rw-r--r--ui/main.menu11
-rw-r--r--ui/menudef.h15
-rw-r--r--ui/mod.menu8
-rw-r--r--ui/options.menu56
-rw-r--r--ui/password.menu8
-rw-r--r--ui/ptrc.menu12
-rw-r--r--ui/quit.menu12
-rw-r--r--ui/quitcredit.menu43
-rw-r--r--ui/say.menu5
-rw-r--r--ui/serverinfo.menu16
-rw-r--r--ui/teamscore.menu86
-rw-r--r--ui/tremulous_alien_builder_hud.menu3
-rw-r--r--ui/tremulous_alien_common_hud.h14
-rw-r--r--ui/tremulous_alien_general_hud.menu2
-rw-r--r--ui/tremulous_alienbuild.menu12
-rw-r--r--ui/tremulous_alienclass.menu16
-rw-r--r--ui/tremulous_aliendialogs.menu12
-rw-r--r--ui/tremulous_alienupgrade.menu12
-rw-r--r--ui/tremulous_common_hud.h43
-rw-r--r--ui/tremulous_default_hud.menu1
-rw-r--r--ui/tremulous_human_hud.menu25
-rw-r--r--ui/tremulous_humanarmoury.menu40
-rw-r--r--ui/tremulous_humanbuild.menu12
-rw-r--r--ui/tremulous_humandialogs.menu12
-rw-r--r--ui/tremulous_humanitem.menu16
-rw-r--r--ui/tremulous_teamselect.menu12
38 files changed, 705 insertions, 630 deletions
diff --git a/ui/connect.menu b/ui/connect.menu
index 38abb3eb..108e33c8 100644
--- a/ui/connect.menu
+++ b/ui/connect.menu
@@ -9,5 +9,6 @@
fullScreen MENU_FALSE
visible MENU_FALSE
style WINDOW_STYLE_SHADER
+ aspectBias ASPECT_NONE
}
}
diff --git a/ui/createfavorite.menu b/ui/createfavorite.menu
index cc3c2c8f..2c35a03e 100644
--- a/ui/createfavorite.menu
+++ b/ui/createfavorite.menu
@@ -51,8 +51,8 @@
type ITEM_TYPE_EDITFIELD
cvar "ui_favoriteName"
rect BORDER BORDER (W-(2*BORDER)) INPUT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
}
@@ -67,8 +67,8 @@
type ITEM_TYPE_EDITFIELD
cvar "ui_favoriteAddress"
rect BORDER ((2*BORDER)+INPUT_H) (W-(2*BORDER)) INPUT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
}
@@ -81,8 +81,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect (W-(2*BUTT_W)) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -101,8 +101,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/createserver.menu b/ui/createserver.menu
index 4c13f13e..e0a00d2e 100644
--- a/ui/createserver.menu
+++ b/ui/createserver.menu
@@ -41,6 +41,7 @@
focusColor 1 .75 0 1
outOfBoundsClick
style WINDOW_STYLE_EMPTY
+ aspectBias ASPECT_NONE
onOpen
{
@@ -97,7 +98,7 @@
outlinecolor 0.1 0.1 0.1 0.5
visible MENU_TRUE
columns 1
- 2 190 ITEM_ALIGN_LEFT
+ 2 190 ALIGN_LEFT
}
@@ -125,8 +126,8 @@
cvar "sv_hostname"
maxChars 40
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(0*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -140,8 +141,8 @@
text "Time Limit:"
cvar "timelimit"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(1*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
maxchars 4
textscale .36
@@ -156,8 +157,8 @@
text "Maximum Players:"
cvar "sv_maxclients"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(2*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
maxchars 4
textscale .36
@@ -172,8 +173,8 @@
text "Require Password:"
cvar "g_needpassword"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(3*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -192,8 +193,8 @@
cvar "g_password"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(4*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
maxchars 10
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -209,8 +210,8 @@
text "Pure Server:"
cvar "sv_pure"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(6*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -231,8 +232,8 @@
cvar "ui_dedicated"
cvarFloatList { "No" 0 "LAN" 1 "Internet" 2 }
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(7*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -250,8 +251,8 @@
text "Auto Download:"
cvar "sv_allowdownload"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(8*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -269,8 +270,8 @@
text "Enable Voting:"
cvar "g_allowvote"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(9*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -290,8 +291,8 @@
text "Minimum Ping:"
cvar "sv_minping"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(11*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
maxchars 4
textscale .36
@@ -306,8 +307,8 @@
text "Maximum Ping:"
cvar "sv_maxping"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(12*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
maxchars 4
textscale .36
@@ -322,8 +323,8 @@
text "Synchronous Client:"
cvar "g_synchronousclients"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(13*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -341,8 +342,8 @@
text "Max Rate:"
cvar "sv_maxrate"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(14*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
maxchars 4
textscale .36
@@ -358,8 +359,8 @@
cvar "sv_zombietime"
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(15*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
maxchars 4
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -374,8 +375,8 @@
cvar "sv_reconnectlimit"
maxchars 4
rect (OPTIONS_X+BORDER) (OPTIONS_Y+ELEM_OFF_Y+(16*ELEM_H)) (OPTIONS_W-(2*BORDER)) ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx ELEM_OFF_X
textscale .36
forecolor 1 1 1 1
@@ -392,6 +393,7 @@
style WINDOW_STYLE_SHADER
background "ui/assets/backarrow.tga"
rect BC_X BC_Y ARROW_H ARROW_W
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
action
{
@@ -412,14 +414,15 @@
style WINDOW_STYLE_SHADER
background "ui/assets/backarrow_alt.tga"
rect BC_X BC_Y ARROW_H ARROW_W
+ aspectBias ALIGN_LEFT
backcolor 0 0 0 0
forecolor 1 1 1 1
visible MENU_FALSE
type ITEM_TYPE_BUTTON
text "Back"
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx ARROW_W
textscale .6
@@ -444,6 +447,7 @@
name accept
style WINDOW_STYLE_SHADER
rect ((BC_X+BC_W)-ARROW_W) BC_Y ARROW_H ARROW_W
+ aspectBias ALIGN_RIGHT
background "ui/assets/forwardarrow.tga"
backcolor 0 0 0 0
forecolor 1 1 1 1
@@ -466,6 +470,7 @@
name accept_alt
style WINDOW_STYLE_SHADER
rect ((BC_X+BC_W)-ARROW_W) BC_Y ARROW_H ARROW_W
+ aspectBias ALIGN_RIGHT
background "ui/assets/forwardarrow_alt.tga"
backcolor 0 0 0 0
type ITEM_TYPE_BUTTON
@@ -474,8 +479,8 @@
type ITEM_TYPE_BUTTON
text "Create"
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx -ARROW_W
textscale .6
diff --git a/ui/drop.menu b/ui/drop.menu
index 2f0077f4..a511f228 100644
--- a/ui/drop.menu
+++ b/ui/drop.menu
@@ -52,8 +52,8 @@
name dropinfo
rect BORDER BORDER INFO_W BUTT_H
text "Disconnected"
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
visible MENU_TRUE
@@ -68,8 +68,8 @@
style WINDOW_STYLE_FILLED
wrapped
cvar "com_errorMessage"
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .33
forecolor 1 1 1 1
visible MENU_TRUE
@@ -84,8 +84,8 @@
textscale .4
style WINDOW_STYLE_EMPTY
rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
backcolor .37 .1 .1 1
visible MENU_TRUE
@@ -104,8 +104,8 @@
textscale .4
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
backcolor .37 .1 .1 1
visible MENU_TRUE
diff --git a/ui/error.menu b/ui/error.menu
index 14e9d058..2f553e99 100644
--- a/ui/error.menu
+++ b/ui/error.menu
@@ -52,8 +52,8 @@
name dropinfo
rect BORDER BORDER INFO_W BUTT_H
text "Error"
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
visible MENU_TRUE
@@ -68,8 +68,8 @@
style WINDOW_STYLE_FILLED
wrapped
cvar "com_errorMessage"
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .33
forecolor 1 1 1 1
visible MENU_TRUE
@@ -84,8 +84,8 @@
textscale .4
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
backcolor .37 .1 .1 1
visible MENU_TRUE
diff --git a/ui/findplayer.menu b/ui/findplayer.menu
index d78dede2..09d715a4 100644
--- a/ui/findplayer.menu
+++ b/ui/findplayer.menu
@@ -28,8 +28,7 @@
onClose { }
onOpen
{
- uiScript FindPlayer;
- setfocus namefield
+ uiScript FindPlayer
}
onESC
@@ -60,8 +59,8 @@
cvar "ui_findplayer"
maxChars 20
rect BORDER BORDER (W-((2*BORDER)+BUTT_W)) SEARCH_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textscale .3
outlinecolor .2 .2 .2 .5
backcolor 0 0 0 0
@@ -80,8 +79,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) BORDER BUTT_W SEARCH_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -127,10 +126,10 @@
notselectable
visible MENU_TRUE
columns 4
- 0 ((2*LEFT_C)*LIST_DW) ITEM_ALIGN_LEFT
- (LEFT_C*LIST_DW) (LEFT_C*LIST_DW) ITEM_ALIGN_LEFT
- ((2*LEFT_C)*LIST_DW) (LEFT_C*LIST_DW) ITEM_ALIGN_LEFT
- ((1-RIGHT_C)*LIST_DW) (RIGHT_C*LIST_DW) ITEM_ALIGN_LEFT
+ 0 ((2*LEFT_C)*LIST_DW) ALIGN_LEFT
+ (LEFT_C*LIST_DW) (LEFT_C*LIST_DW) ALIGN_LEFT
+ ((2*LEFT_C)*LIST_DW) (LEFT_C*LIST_DW) ALIGN_LEFT
+ ((1-RIGHT_C)*LIST_DW) (RIGHT_C*LIST_DW) ALIGN_LEFT
}
// BUTTON //
@@ -143,8 +142,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(2*BUTT_W)) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action { ui_script FoundPlayerJoinServer }
@@ -158,8 +157,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/ingame.menu b/ui/ingame.menu
index 07b969e6..90b4cf12 100644
--- a/ui/ingame.menu
+++ b/ui/ingame.menu
@@ -39,6 +39,7 @@
focusColor 1 .75 0 1
disableColor .5 .5 .5 1
backColor 0 0 0 1
+ aspectBias ALIGN_LEFT
onEsc
{
@@ -67,8 +68,8 @@
rect BUTT_BAR_X BUTT_BAR_Y BUTT_W BUTT_H
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx -BUTT_TEXT_S
textscale .4
forecolor 1 1 1 1
@@ -87,8 +88,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (BUTT_BAR_X+BUTT_W) BUTT_BAR_Y BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
visible MENU_TRUE
@@ -106,8 +107,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (BUTT_BAR_X+(2*BUTT_W)) BUTT_BAR_Y BUTT_W BUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx BUTT_TEXT_S
textscale .4
forecolor 1 1 1 1
diff --git a/ui/ingame_game.menu b/ui/ingame_game.menu
index 11603536..0306897b 100644
--- a/ui/ingame_game.menu
+++ b/ui/ingame_game.menu
@@ -65,6 +65,7 @@
outOfBoundsClick // this closes the window if it gets a click out of the rectangle
rect X Y W H
focusColor 1 .75 0 1
+ aspectBias ALIGN_LEFT
onopen
{
uiScript InitIgnoreList;
@@ -102,8 +103,8 @@
style WINDOW_STYLE_EMPTY
rect (W-((3*TOPBUTT_W)+BORDER)) BORDER TOPBUTT_W TOPBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .35
forecolor 1 1 1 1
visible MENU_TRUE
@@ -128,8 +129,8 @@
style WINDOW_STYLE_EMPTY
rect (W-((2*TOPBUTT_W)+BORDER)) BORDER TOPBUTT_W TOPBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .35
forecolor 1 1 1 1
visible MENU_TRUE
@@ -153,8 +154,8 @@
style WINDOW_STYLE_EMPTY
rect (W-((1*TOPBUTT_W)+BORDER)) BORDER TOPBUTT_W TOPBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .35
forecolor 1 1 1 1
visible MENU_TRUE
@@ -182,8 +183,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -204,8 +205,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+SIDEBUTT_H) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -226,8 +227,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(2*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -287,8 +288,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect MAPBUTT_X MAPBUTT_Y MAPBUTT_W MAPBUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -307,8 +308,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect MAPBUTT_X (MAPBUTT_Y+MAPBUTT_H) MAPBUTT_W MAPBUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -327,8 +328,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect MAPBUTT_X (MAPBUTT_Y+(2*MAPBUTT_H)) MAPBUTT_W MAPBUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -368,8 +369,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect PBUTT_X PBUTT_Y (PBUTT_W/2) PBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -388,8 +389,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect (PBUTT_X+(PBUTT_W/2)) PBUTT_Y (PBUTT_W/2) PBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -408,8 +409,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect PBUTT_X (PBUTT_Y+PBUTT_H) PBUTT_W PBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -450,8 +451,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect PBUTT_X PBUTT_Y (PBUTT_W/2) PBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -470,8 +471,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect (PBUTT_X+(PBUTT_W/2)) PBUTT_Y (PBUTT_W/2) PBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -491,8 +492,8 @@
textscale .25
rect 110 215 150 20
rect PBUTT_X (PBUTT_Y+PBUTT_H) (PBUTT_W/2) PBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -511,8 +512,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect (PBUTT_X+(PBUTT_W/2)) (PBUTT_Y+PBUTT_H) (PBUTT_W/2) PBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -530,8 +531,8 @@
group gameGrp
rect IGNORE_X IGNHEAD_Y (PLAYER_C*IGNORE_W2) IGNHEAD_H
text "Player Name"
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx IGNORE_TOFF
visible MENU_FALSE
type ITEM_TYPE_TEXT
@@ -543,8 +544,8 @@
group gameGrp
rect (IGNORE_X+(PLAYER_C*IGNORE_W2)) IGNHEAD_Y (IGN_C*IGNORE_W2) IGNHEAD_H
text "Ignored"
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
visible MENU_FALSE
type ITEM_TYPE_TEXT
textscale .225
@@ -555,8 +556,8 @@
group gameGrp
rect (IGNORE_X+((PLAYER_C+IGN_C)*IGNORE_W2)) IGNHEAD_Y (IGNY_C*IGNORE_W2) IGNHEAD_H
text "Ignoring You"
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
visible MENU_FALSE
type ITEM_TYPE_TEXT
textscale .225
@@ -581,9 +582,9 @@
feeder FEEDER_IGNORE_LIST
visible MENU_FALSE
columns 3
- IGNORE_TOFF ((PLAYER_C*IGNORE_W)-(3*IGNORE_TOFF)) ITEM_ALIGN_LEFT
- (IGNORE_TOFF+((PLAYER_C)*IGNORE_W)) ((IGN_C*IGNORE_W)-(3*IGNORE_TOFF)) ITEM_ALIGN_CENTER
- (IGNORE_TOFF+((PLAYER_C+IGN_C)*IGNORE_W)) ((IGNY_C*IGNORE_W)-(3*IGNORE_TOFF)) ITEM_ALIGN_CENTER
+ IGNORE_TOFF ((PLAYER_C*IGNORE_W)-(3*IGNORE_TOFF)) ALIGN_LEFT
+ (IGNORE_TOFF+((PLAYER_C)*IGNORE_W)) ((IGN_C*IGNORE_W)-(3*IGNORE_TOFF)) ALIGN_CENTER
+ (IGNORE_TOFF+((PLAYER_C+IGN_C)*IGNORE_W)) ((IGNY_C*IGNORE_W)-(3*IGNORE_TOFF)) ALIGN_CENTER
doubleClick
{
play "sound/misc/menu1.wav";
@@ -599,8 +600,8 @@
style WINDOW_STYLE_EMPTY
rect IGNBUTT_X IGNBUTT_Y IGNBUTT_W IGNBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -619,8 +620,8 @@
style WINDOW_STYLE_EMPTY
rect (IGNBUTT_X+IGNBUTT_W) IGNBUTT_Y IGNBUTT_W IGNBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -642,8 +643,8 @@
style WINDOW_STYLE_EMPTY
text "Server Name:"
cvar ui_serverinfo_hostname
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
forecolor 1 1 1 1
@@ -660,8 +661,8 @@
style WINDOW_STYLE_EMPTY
text "Time Limit:"
cvar ui_serverinfo_timelimit
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
forecolor 1 1 1 1
@@ -678,8 +679,8 @@
style WINDOW_STYLE_EMPTY
text "Sudden Death Time:"
cvar ui_serverinfo_sd
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
forecolor 1 1 1 1
@@ -696,8 +697,8 @@
style WINDOW_STYLE_EMPTY
text "Max Clients:"
cvar ui_serverinfo_maxclients
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
forecolor 1 1 1 1
@@ -714,8 +715,8 @@
style WINDOW_STYLE_EMPTY
text "Map Name:"
cvar ui_serverinfo_mapname
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
forecolor 1 1 1 1
@@ -732,8 +733,8 @@
style WINDOW_STYLE_EMPTY
text "Lag Correction:"
cvar ui_serverinfo_unlagged
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
forecolor 1 1 1 1
@@ -751,8 +752,8 @@
text "Friendly Fire:"
cvarFloat ui_serverinfo_ff 0 0 7
cvarFloatList { "Off" 0 "Humans Only" 1 "Aliens Only" 2 "Both Teams" 3 "Buildables Only" 4 "Humans and Buildables" 5 "Aliens and Buildables" 6 "Both Teams and Buildables" 7 }
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
forecolor 1 1 1 1
@@ -769,8 +770,8 @@
style WINDOW_STYLE_EMPTY
text "Version:"
cvar ui_serverinfo_version
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
forecolor 1 1 1 1
diff --git a/ui/ingame_leave.menu b/ui/ingame_leave.menu
index 38fcb931..5aa5cc78 100644
--- a/ui/ingame_leave.menu
+++ b/ui/ingame_leave.menu
@@ -25,6 +25,7 @@
outOfBoundsClick // this closes the window if it gets a click out of the rectangle
rect X Y W H
focusColor 1 .75 0 1
+ aspectBias ALIGN_LEFT
onOpen
{
show grpMenu;
@@ -53,8 +54,8 @@
group grpMenu
style WINDOW_STYLE_EMPTY
rect L1_X L1_Y L1_W L1_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -74,8 +75,8 @@
text "Quit"
style WINDOW_STYLE_EMPTY
rect L2_X L2_Y L2_W L2_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -98,8 +99,8 @@
group grpConfirm
style WINDOW_STYLE_EMPTY
rect L1_X L1_Y L1_W L1_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
decoration
forecolor 1 1 1 1
@@ -115,8 +116,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect L2_X L2_Y (L2_W/2) L2_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -135,8 +136,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect (L2_X+(L2_W/2)) L2_Y (L2_W/2) L2_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -154,8 +155,8 @@
group grpConfirm
style WINDOW_STYLE_EMPTY
rect L1_X L1_Y L1_W L1_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
decoration
@@ -171,8 +172,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect L2_X L2_Y (L2_W/2) L2_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -191,8 +192,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect (L2_X+(L2_W/2)) L2_Y (L2_W/2) L2_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 3f2978a4..fe8c5e37 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -34,6 +34,7 @@
outOfBoundsClick // this closes the window if it gets a click out of the rectangle
rect X Y W H
focusColor 1 .75 0 1
+ aspectBias ALIGN_LEFT
onopen
{
hide optionsGrp;
@@ -67,8 +68,8 @@
style WINDOW_STYLE_EMPTY
rect (W-((3*TOPBUTT_W)+BORDER)) BORDER TOPBUTT_W TOPBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .35
forecolor 1 1 1 1
visible MENU_TRUE
@@ -92,8 +93,8 @@
style WINDOW_STYLE_EMPTY
rect (W-((2*TOPBUTT_W)+BORDER)) BORDER TOPBUTT_W TOPBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .35
forecolor 1 1 1 1
visible MENU_TRUE
@@ -118,8 +119,8 @@
style WINDOW_STYLE_EMPTY
rect (W-((1*TOPBUTT_W)+BORDER)) BORDER TOPBUTT_W TOPBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .35
forecolor 1 1 1 1
visible MENU_TRUE
@@ -148,8 +149,8 @@
cvar "name"
maxchars 40
rect CONTENT_X (CONTENT_Y+(0*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -164,8 +165,8 @@
text "Auto Download:"
cvar "cl_allowDownload"
rect CONTENT_X (CONTENT_Y+(1*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -184,8 +185,8 @@
text "Taunts Sounds Off:"
cvar "cg_noTaunt"
rect CONTENT_X (CONTENT_Y+(2*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -204,8 +205,8 @@
text "Team Chats Only:"
cvar "cg_teamChatsOnly"
rect CONTENT_X (CONTENT_Y+(3*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -224,8 +225,8 @@
text "Auto Wallwalk Pitching:"
cvar "cg_wwFollow"
rect CONTENT_X (CONTENT_Y+(4*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -245,8 +246,8 @@
cvarfloat "cg_wwSmoothTime" 300 0 1000
cvarFloatList { "Medium" 300 "Fast" 150 "Instant" 0 "Slow" 600 }
rect CONTENT_X (CONTENT_Y+(5*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -265,8 +266,8 @@
text "Wallwalk Control Toggles:"
cvar "cg_wwToggle"
rect CONTENT_X (CONTENT_Y+(6*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -285,8 +286,8 @@
text "Disable Warning Dialogs:"
cvar "cg_disableWarningDialogs"
rect CONTENT_X (CONTENT_Y+(7*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -305,8 +306,8 @@
text "Tutorial Mode:"
cvar "cg_tutorial"
rect CONTENT_X (CONTENT_Y+(8*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -326,8 +327,8 @@
cvar "cg_drawClock"
cvarFloatList { "No" 0 "12 Hour" 1 "24 Hour" 2 }
rect CONTENT_X (CONTENT_Y+(9*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -347,8 +348,8 @@
cvar "cg_drawCrosshair"
cvarFloatList { "Never" 0 "Ranged Weapons Only" 1 "Always" 2 }
rect CONTENT_X (CONTENT_Y+(10*ELEM_H)) CONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx CONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -370,8 +371,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(0*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -394,8 +395,8 @@
text "Lookup:"
cvar "+lookup"
rect SCONTENT_X (SCONTENT_Y+(0*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -414,8 +415,8 @@
text "Look Down:"
cvar "+lookdown"
rect SCONTENT_X (SCONTENT_Y+(1*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -434,8 +435,8 @@
text "Mouse Look:"
cvar "+mlook"
rect SCONTENT_X (SCONTENT_Y+(2*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -454,8 +455,8 @@
text "Centerview:"
cvar "centerview"
rect SCONTENT_X (SCONTENT_Y+(3*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -474,8 +475,8 @@
text "Free Look:"
cvar "cl_freelook"
rect SCONTENT_X (SCONTENT_Y+(4*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -494,8 +495,8 @@
text "Mouse Sensitivity:"
cvarfloat "sensitivity" 5 1 30
rect SCONTENT_X (SCONTENT_Y+(5*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -510,8 +511,8 @@
text "Invert Mouse:"
cvar "ui_mousePitch"
rect SCONTENT_X (SCONTENT_Y+(6*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -531,8 +532,8 @@
text "Smooth Mouse:"
cvar "m_filter"
rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -553,8 +554,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(1*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -575,8 +576,8 @@
text "Always Run:"
cvar "cl_run"
rect SCONTENT_X (SCONTENT_Y+(0*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -595,8 +596,8 @@
text "Run / Walk:"
cvar "+speed"
rect SCONTENT_X (SCONTENT_Y+(1*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -615,8 +616,8 @@
text "Sprint:"
cvar "boost"
rect SCONTENT_X (SCONTENT_Y+(2*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -635,8 +636,8 @@
text "Forward:"
cvar "+forward"
rect SCONTENT_X (SCONTENT_Y+(3*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -655,8 +656,8 @@
text "Backpedal:"
cvar "+back"
rect SCONTENT_X (SCONTENT_Y+(4*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -675,8 +676,8 @@
text "Move Left:"
cvar "+moveleft"
rect SCONTENT_X (SCONTENT_Y+(5*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -695,8 +696,8 @@
text "Move Right:"
cvar "+moveright"
rect SCONTENT_X (SCONTENT_Y+(6*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -715,8 +716,8 @@
text "Jump:"
cvar "+moveup"
rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -735,8 +736,8 @@
text "Crouch:"
cvar "+movedown"
rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -755,8 +756,8 @@
text "Turn Left:"
cvar "+left"
rect SCONTENT_X (SCONTENT_Y+(9*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -775,8 +776,8 @@
text "Turn Right:"
cvar "+right"
rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -795,8 +796,8 @@
text "Strafe:"
cvar "+strafe"
rect SCONTENT_X (SCONTENT_Y+(11*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -819,8 +820,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(2*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -841,8 +842,8 @@
text "Primary Attack:"
cvar "+attack"
rect SCONTENT_X (SCONTENT_Y+(0*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -861,8 +862,8 @@
text "Secondary Attack:"
cvar "+button5"
rect SCONTENT_X (SCONTENT_Y+(1*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -881,8 +882,8 @@
text "Previous Upgrade:"
cvar "weapprev"
rect SCONTENT_X (SCONTENT_Y+(2*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -901,8 +902,8 @@
text "Next Upgrade:"
cvar "weapnext"
rect SCONTENT_X (SCONTENT_Y+(3*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -921,8 +922,8 @@
text "Activate Upgrade:"
cvar "+button2"
rect SCONTENT_X (SCONTENT_Y+(4*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -941,8 +942,8 @@
text "Reload:"
cvar "reload"
rect SCONTENT_X (SCONTENT_Y+(5*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -961,8 +962,8 @@
text "Buy Ammo:"
cvar "buy ammo"
rect SCONTENT_X (SCONTENT_Y+(6*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -981,8 +982,8 @@
text "Use Medkit:"
cvar "itemact medkit"
rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1003,8 +1004,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(3*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -1025,8 +1026,8 @@
text "Show Scores:"
cvar "+scores"
rect SCONTENT_X (SCONTENT_Y+(0*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1045,8 +1046,8 @@
text "Scroll Scores Up:"
cvar "scoresUp"
rect SCONTENT_X (SCONTENT_Y+(1*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1065,8 +1066,8 @@
text "Scroll Scores Down:"
cvar "scoresDown"
rect SCONTENT_X (SCONTENT_Y+(2*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1085,8 +1086,8 @@
text "Use Structure/Evolve:"
cvar "+button7"
rect SCONTENT_X (SCONTENT_Y+(3*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1105,8 +1106,8 @@
text "Deconstruct Structure:"
cvar "deconstruct"
rect SCONTENT_X (SCONTENT_Y+(4*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1125,8 +1126,8 @@
text "Gesture:"
cvar "+button3"
rect SCONTENT_X (SCONTENT_Y+(5*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1145,8 +1146,8 @@
text "Chat:"
cvar "messagemode"
rect SCONTENT_X (SCONTENT_Y+(6*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1165,8 +1166,8 @@
text "Team Chat:"
cvar "messagemode2"
rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1185,8 +1186,8 @@
text "Vote Yes:"
cvar "vote yes"
rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1205,8 +1206,8 @@
text "Vote No:"
cvar "vote no"
rect SCONTENT_X (SCONTENT_Y+(9*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1225,8 +1226,8 @@
text "Team Vote Yes:"
cvar "teamvote yes"
rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1245,8 +1246,8 @@
text "Team Vote No:"
cvar "teamvote no"
rect SCONTENT_X (SCONTENT_Y+(11*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1270,8 +1271,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(0*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -1295,8 +1296,8 @@
cvar "ui_glCustom"
cvarFloatList { "High Quality" 0 "Normal" 1 "Fast" 2 "Fastest" 3 "Custom" 4 }
rect SCONTENT_X (SCONTENT_Y+(0*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1316,8 +1317,8 @@
text "GL Extensions:"
cvar "r_allowExtensions"
rect SCONTENT_X (SCONTENT_Y+(1*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1340,8 +1341,8 @@
"800x600" 4 "960x720" 5 "1024x768" 6 "1152x864" 7
"1280x1024" 8 "1600x1200" 9 "2048x1536" 10 "856x480 wide screen" 11 }
rect SCONTENT_X (SCONTENT_Y+(2*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1362,8 +1363,8 @@
cvar "r_colorbits"
cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 }
rect SCONTENT_X (SCONTENT_Y+(3*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1384,8 +1385,8 @@
text "Fullscreen:"
cvar "r_fullscreen"
rect SCONTENT_X (SCONTENT_Y+(4*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1406,8 +1407,8 @@
cvar "r_vertexlight"
cvarFloatList { "Light Map (high)" 0 "Vertex (low)" 1 }
rect SCONTENT_X (SCONTENT_Y+(5*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1428,8 +1429,8 @@
cvar "r_lodbias"
cvarFloatList { "High" 0 "Medium" 1 "Low" 2 }
rect SCONTENT_X (SCONTENT_Y+(6*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1451,8 +1452,8 @@
cvar "r_picmip"
cvarFloatList { "Low" 2 "Normal" 1 "High" 0 }
rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1473,8 +1474,8 @@
cvar "r_texturebits"
cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 }
rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1494,8 +1495,8 @@
cvar "r_texturemode"
cvarStrList { "Bilinear", "GL_LINEAR_MIPMAP_NEAREST", "Trilinear", "GL_LINEAR_MIPMAP_LINEAR" }
rect SCONTENT_X (SCONTENT_Y+(9*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1515,8 +1516,8 @@
text "Anisotropic Filtering:"
cvar "r_ext_texture_filter_anisotropic"
rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1536,8 +1537,8 @@
text "Compress Textures:"
cvar "r_ext_compressed_textures "
rect SCONTENT_X (SCONTENT_Y+(11*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1558,8 +1559,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect SCONTENT_X (SCONTENT_Y+(13*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
@@ -1579,8 +1580,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(1*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -1601,8 +1602,8 @@
text "Brightness:"
cvarfloat "r_gamma" 1 .5 2
rect SCONTENT_X (SCONTENT_Y+(0*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1617,8 +1618,8 @@
text "Screen Size:"
cvarfloat "cg_viewsize" 100 30 100
rect SCONTENT_X (SCONTENT_Y+(1*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1633,8 +1634,8 @@
text "Marks On Walls:"
cvar "cg_marks"
rect SCONTENT_X (SCONTENT_Y+(2*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1653,8 +1654,8 @@
text "Dynamic Lights:"
cvar "r_dynamiclight"
rect SCONTENT_X (SCONTENT_Y+(3*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1673,8 +1674,8 @@
text "Draw Gun:"
cvar "cg_drawGun"
rect SCONTENT_X (SCONTENT_Y+(4*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1693,8 +1694,8 @@
text "Low Quality Sky:"
cvar "r_fastsky"
rect SCONTENT_X (SCONTENT_Y+(5*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1713,8 +1714,8 @@
text "Sync Every Frame:"
cvar "r_finish"
rect SCONTENT_X (SCONTENT_Y+(6*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1733,8 +1734,8 @@
text "Show Time:"
cvar "cg_drawTimer"
rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1753,8 +1754,8 @@
text "In Game Videos:"
cvar "r_inGameVideo"
rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1773,8 +1774,8 @@
text "Depth Sort Particles:"
cvar "cg_depthSortParticles"
rect SCONTENT_X (SCONTENT_Y+(9*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1794,8 +1795,8 @@
cvar "cg_bounceParticles"
cvarFloatList { "Low Quality" 0 "High Quality" 1 }
rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1815,8 +1816,8 @@
cvar "cg_lightFlare"
cvarFloatList { "Off" 0 "No Fade" 1 "Timed Fade" 2 "Real Fade" 3 }
rect SCONTENT_X (SCONTENT_Y+(11*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1837,8 +1838,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(2*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -1858,8 +1859,8 @@
rect SCONTENT_X SCONTENT_Y SCONTENT_W (H-(SCONTENT_Y+BORDER))
ownerdraw UI_GLINFO
textscale .25
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx 4
textaligny 4
forecolor 1 1 1 1
@@ -1877,8 +1878,8 @@
style WINDOW_STYLE_EMPTY
rect 0 ((2*BORDER)+TOPBUTT_H+(3*SIDEBUTT_H)) SIDEBUTT_W SIDEBUTT_H
type ITEM_TYPE_BUTTON
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -1898,8 +1899,8 @@
style WINDOW_STYLE_FILLED
text "Sound"
rect SCONTENT_X (SCONTENT_Y+(0*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -1918,8 +1919,8 @@
text "Effects Volume:"
cvarfloat "s_volume" 0.7 0 1
rect SCONTENT_X (SCONTENT_Y+(1*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1934,8 +1935,8 @@
text "Music Volume:"
cvarfloat "s_musicvolume" 0.25 0 1
rect SCONTENT_X (SCONTENT_Y+(2*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1950,8 +1951,8 @@
text "OpenAL:"
cvar "s_useOpenAL"
rect SCONTENT_X (SCONTENT_Y+(3*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1971,8 +1972,8 @@
cvar "s_khz"
cvarFloatList { "44 khz (very high)" 44 "22 khz (high)" 22 "11 khz (low)" 11 }
rect SCONTENT_X (SCONTENT_Y+(4*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -1991,8 +1992,8 @@
text "Doppler Sound:"
cvar "s_doppler"
rect SCONTENT_X (SCONTENT_Y+(5*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -2010,8 +2011,8 @@
style WINDOW_STYLE_FILLED
text "Network"
rect SCONTENT_X (SCONTENT_Y+(7*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_FALSE
@@ -2031,8 +2032,8 @@
cvar "rate"
cvarFloatList { "<=28.8k" 2500 "33.6k" 3000 "56k" 4000 "ISDN" 5000 "LAN/CABLE/xDSl" 25000 }
rect SCONTENT_X (SCONTENT_Y+(8*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx SCONTENT_OFF
textscale .25
forecolor 1 1 1 1
@@ -2052,8 +2053,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect SCONTENT_X (SCONTENT_Y+(10*ELEM_H)) SCONTENT_W ELEM_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_FALSE
action
diff --git a/ui/joinserver.menu b/ui/joinserver.menu
index e169183e..b9bc9540 100644
--- a/ui/joinserver.menu
+++ b/ui/joinserver.menu
@@ -53,6 +53,7 @@
focusColor 1 .75 0 1
outOfBoundsClick
style WINDOW_STYLE_EMPTY
+ aspectBias ASPECT_NONE
onOpen
{
uiScript InitServerList 3;
@@ -85,8 +86,8 @@
style WINDOW_STYLE_EMPTY
ownerdraw UI_NETSOURCE
rect TOP_X TOP_Y TOPBUTT_W TOPBUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx TOP_TOFF_X
textaligny TOP_TOFF_Y
textscale .4
@@ -109,8 +110,8 @@
textscale .4
style WINDOW_STYLE_EMPTY
rect (TOP_X+TOPBUTT_W) TOP_Y TOPBUTT_W TOPBUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx TOP_TOFF_X
textaligny TOP_TOFF_Y
backcolor .5 .5 .5 .5
@@ -131,8 +132,8 @@
style WINDOW_STYLE_EMPTY
type ITEM_TYPE_BUTTON
rect (TOP_X+(2*TOPBUTT_W)) TOP_Y TOPBUTT_W TOPBUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx TOP_TOFF_X
textaligny TOP_TOFF_Y
backcolor .5 .5 .5 .5
@@ -154,8 +155,8 @@
cvar "ui_browserShowEmpty"
textscale .4
rect TOP_X (TOP_Y+TOPBUTT_H) TOPBUTT_W TOPBUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx TOP_TOFF_X
textaligny TOP_TOFF_Y
forecolor 1 1 1 1
@@ -177,8 +178,8 @@
cvar "ui_browserShowFull"
textscale .4
rect (TOP_X+TOPBUTT_W) (TOP_Y+TOPBUTT_H) TOPBUTT_W TOPBUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx TOP_TOFF_X
textaligny TOP_TOFF_Y
forecolor 1 1 1 1
@@ -217,8 +218,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect LIST_X LIST_Y (SERVER_C*LIST_W) HEADFOOT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx LIST_TOFF
border WINDOW_BORDER_FULL
bordercolor 0.5 0.5 0.5 1
@@ -259,8 +260,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (LIST_X+(SERVER_C*LIST_W)) LIST_Y (MAP_C*LIST_W) HEADFOOT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx LIST_TOFF
border WINDOW_BORDER_FULL
bordercolor 0.5 0.5 0.5 1
@@ -301,8 +302,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (LIST_X+((SERVER_C+MAP_C)*LIST_W)) LIST_Y (PLAYERS_C*LIST_W) HEADFOOT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx LIST_TOFF
border WINDOW_BORDER_FULL
bordercolor 0.5 0.5 0.5 1
@@ -343,8 +344,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (LIST_X+((SERVER_C+MAP_C+PLAYERS_C)*LIST_W)) LIST_Y (PING_C*LIST_W) HEADFOOT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx LIST_TOFF
border WINDOW_BORDER_FULL
bordercolor 0.5 0.5 0.5 1
@@ -396,10 +397,10 @@
outlinecolor 0.1 0.1 0.1 0.5
visible MENU_TRUE
columns 4
- LIST_TOFF ((SERVER_C*LIST_W)-(3*LIST_TOFF)) ITEM_ALIGN_LEFT
- (LIST_TOFF+((SERVER_C)*LIST_W)) ((MAP_C*LIST_W)-(3*LIST_TOFF)) ITEM_ALIGN_LEFT
- (LIST_TOFF+((SERVER_C+MAP_C)*LIST_W)) ((PLAYERS_C*LIST_W)-(3*LIST_TOFF)) ITEM_ALIGN_LEFT
- (LIST_TOFF+((SERVER_C+MAP_C+PLAYERS_C)*LIST_W)) ((PING_C*LIST_W)-(3*LIST_TOFF)) ITEM_ALIGN_LEFT
+ LIST_TOFF ((SERVER_C*LIST_W)-(3*LIST_TOFF)) ALIGN_LEFT
+ (LIST_TOFF+((SERVER_C)*LIST_W)) ((MAP_C*LIST_W)-(3*LIST_TOFF)) ALIGN_LEFT
+ (LIST_TOFF+((SERVER_C+MAP_C)*LIST_W)) ((PLAYERS_C*LIST_W)-(3*LIST_TOFF)) ALIGN_LEFT
+ (LIST_TOFF+((SERVER_C+MAP_C+PLAYERS_C)*LIST_W)) ((PING_C*LIST_W)-(3*LIST_TOFF)) ALIGN_LEFT
doubleClick { uiScript JoinServer }
}
@@ -413,8 +414,8 @@
ownerdraw UI_SERVERREFRESHDATE
textscale .33
rect LIST_X (LIST_Y+(LIST_H-HEADFOOT_H)) (LIST_W/2) HEADFOOT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx LIST_TOFF
forecolor 1 1 1 1
border WINDOW_BORDER_FULL
@@ -429,8 +430,8 @@
ownerdraw UI_SERVERMOTD
textscale .33
rect (LIST_X+(LIST_W/2)) (LIST_Y+(LIST_H-HEADFOOT_H)) (LIST_W/2) HEADFOOT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx LIST_TOFF
forecolor 1 1 1 1
border WINDOW_BORDER_FULL
@@ -450,8 +451,8 @@
textscale .4
style WINDOW_STYLE_EMPTY
rect BOT_X BOT_Y BOTBUTT_W BOTBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -469,8 +470,8 @@
textscale .4
style WINDOW_STYLE_EMPTY
rect (BOT_X+BOTBUTT_W) BOT_Y BOTBUTT_W BOTBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -489,8 +490,8 @@
style WINDOW_STYLE_EMPTY
ownerdrawFlag UI_SHOW_NOTFAVORITESERVERS
rect (BOT_X+(2*BOTBUTT_W)) BOT_Y BOTBUTT_W BOTBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -509,8 +510,8 @@
style WINDOW_STYLE_EMPTY
ownerdrawFlag UI_SHOW_FAVORITESERVERS
rect (BOT_X+(2*BOTBUTT_W)) BOT_Y BOTBUTT_W BOTBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -529,8 +530,8 @@
textscale .4
style WINDOW_STYLE_EMPTY
rect (BOT_X+(3*BOTBUTT_W)) BOT_Y BOTBUTT_W BOTBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -548,8 +549,8 @@
textscale .4
style WINDOW_STYLE_EMPTY
rect (BOT_X+(4*BOTBUTT_W)) BOT_Y BOTBUTT_W BOTBUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -571,8 +572,8 @@
style WINDOW_STYLE_EMPTY
type ITEM_TYPE_BUTTON
rect (BCJ_X+ARROW_W) BCJ_Y (BCJ_W-(2*ARROW_W)) BCJ_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -589,6 +590,7 @@
style WINDOW_STYLE_SHADER
background "ui/assets/backarrow.tga"
rect BCJ_X BCJ_Y ARROW_H ARROW_W
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
action
{
@@ -609,14 +611,15 @@
style WINDOW_STYLE_SHADER
background "ui/assets/backarrow_alt.tga"
rect BCJ_X BCJ_Y ARROW_H ARROW_W
+ aspectBias ALIGN_LEFT
backcolor 0 0 0 0
forecolor 1 1 1 1
visible MENU_FALSE
type ITEM_TYPE_BUTTON
text "Back"
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx ARROW_W
textscale .6
@@ -641,6 +644,7 @@
name accept
style WINDOW_STYLE_SHADER
rect ((BCJ_X+BCJ_W)-ARROW_W) BCJ_Y ARROW_H ARROW_W
+ aspectBias ALIGN_RIGHT
background "ui/assets/forwardarrow.tga"
backcolor 0 0 0 0
forecolor 1 1 1 1
@@ -663,6 +667,7 @@
name accept_alt
style WINDOW_STYLE_SHADER
rect ((BCJ_X+BCJ_W)-ARROW_W) BCJ_Y ARROW_H ARROW_W
+ aspectBias ALIGN_RIGHT
background "ui/assets/forwardarrow_alt.tga"
backcolor 0 0 0 0
type ITEM_TYPE_BUTTON
@@ -671,8 +676,8 @@
type ITEM_TYPE_BUTTON
text "Join"
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx -ARROW_W
textscale .6
diff --git a/ui/loading.menu b/ui/loading.menu
index f7f35cfa..2b4af59c 100644
--- a/ui/loading.menu
+++ b/ui/loading.menu
@@ -53,6 +53,7 @@
name "Loading"
rect 0 0 W H
fullScreen MENU_TRUE
+ aspectBias ASPECT_NONE
itemDef
{
@@ -71,8 +72,8 @@
visible MENU_TRUE
decoration
forecolor 1 1 1 1
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textstyle ITEM_TEXTSTYLE_NORMAL
textscale 0.4
ownerdraw CG_LOAD_LEVELNAME
@@ -85,8 +86,8 @@
visible MENU_TRUE
decoration
forecolor 1 1 1 1
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textstyle ITEM_TEXTSTYLE_NORMAL
textscale 0.4
ownerdraw CG_LOAD_HOSTNAME
@@ -99,8 +100,8 @@
visible MENU_TRUE
decoration
forecolor 1 1 1 1
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textstyle ITEM_TEXTSTYLE_NORMAL
textscale 0.4
ownerdraw CG_LOAD_MOTD
@@ -128,7 +129,7 @@
decoration
forecolor 0.0 0.8 1 1
ownerdraw CG_LOAD_MEDIA
- textalign ITEM_ALIGN_CENTER
+ textalign ALIGN_CENTER
textstyle ITEM_TEXTSTYLE_NEON
textscale 0.5
special 1.0
@@ -140,8 +141,8 @@
style WINDOW_STYLE_EMPTY
textscale 0.6
rect LABEL_X MEDIA_Y LABEL_W BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
forecolor 0.0 0.8 1 1
visible MENU_TRUE
decoration
@@ -157,7 +158,7 @@
decoration
forecolor 0.0 0.8 1 1
ownerdraw CG_LOAD_BUILDABLES
- textalign ITEM_ALIGN_CENTER
+ textalign ALIGN_CENTER
textstyle ITEM_TEXTSTYLE_NEON
textscale 0.5
special 1.0
@@ -169,8 +170,8 @@
style WINDOW_STYLE_EMPTY
textscale 0.6
rect LABEL_X BUILD_Y LABEL_W BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
forecolor 0.0 0.8 1 1
visible MENU_TRUE
decoration
@@ -185,7 +186,7 @@
decoration
forecolor 0.0 0.8 1 1
ownerdraw CG_LOAD_CHARMODEL
- textalign ITEM_ALIGN_CENTER
+ textalign ALIGN_CENTER
textstyle ITEM_TEXTSTYLE_NEON
textscale 0.5
special 1.0
@@ -197,8 +198,8 @@
style WINDOW_STYLE_EMPTY
textscale 0.6
rect LABEL_X CHAR_Y LABEL_W BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
forecolor 0.0 0.8 1 1
visible MENU_TRUE
decoration
@@ -213,7 +214,7 @@
decoration
forecolor 0.0 0.8 1 1
ownerdraw CG_LOAD_OVERALL
- textalign ITEM_ALIGN_CENTER
+ textalign ALIGN_CENTER
textstyle ITEM_TEXTSTYLE_NEON
textscale 0.5
special 1.0
diff --git a/ui/main.menu b/ui/main.menu
index d7745c3a..7e6f2612 100644
--- a/ui/main.menu
+++ b/ui/main.menu
@@ -29,6 +29,7 @@
visible MENU_TRUE // Visible on open
focusColor 1 .75 0 1 // Menu focus color for text and items
background "ui/assets/mainmenu.jpg"
+ aspectBias ASPECT_NONE
onOpen { uiScript stopRefresh ; playlooped "sound/ui/heartbeat.wav" }
onESC { open quit_popmenu }
@@ -60,7 +61,7 @@
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
rect X Y W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale .416
forecolor 1 1 1 1
visible MENU_TRUE
@@ -80,7 +81,7 @@
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .416
rect X (Y+ELEM_H) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
backcolor 0 0 0 0
forecolor 1 1 1 1
visible MENU_TRUE
@@ -100,7 +101,7 @@
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .416
rect X (Y+(2*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
backcolor 0 0 0 0
forecolor 1 1 1 1
visible MENU_TRUE
@@ -120,7 +121,7 @@
textstyle ITEM_TEXTSTYLE_NORMAL
rect X (Y+(3*ELEM_H)) W ELEM_H
textscale .416
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -138,7 +139,7 @@
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .25
rect 0 450 640 10
- textalign ITEM_ALIGN_CENTER
+ textalign ALIGN_CENTER
forecolor .75 .75 .75 .75
visible MENU_TRUE
decoration
diff --git a/ui/menudef.h b/ui/menudef.h
index 42196031..3e5abcaa 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -16,13 +16,14 @@
#define ITEM_TYPE_MULTI 12 // multiple list setting, enumerated
#define ITEM_TYPE_BIND 13 // multiple list setting, enumerated
-#define ITEM_ALIGN_LEFT 0 // left alignment
-#define ITEM_ALIGN_CENTER 1 // center alignment
-#define ITEM_ALIGN_RIGHT 2 // right alignment
-
-#define ITEM_VALIGN_BOTTOM 0 // bottom alignment
-#define ITEM_VALIGN_CENTER 1 // center alignment
-#define ITEM_VALIGN_TOP 2 // top alignment
+#define ALIGN_LEFT 0 // left alignment
+#define ALIGN_CENTER 1 // center alignment
+#define ALIGN_RIGHT 2 // right alignment
+#define ASPECT_NONE 3 // no aspect compensation
+
+#define VALIGN_BOTTOM 0 // bottom alignment
+#define VALIGN_CENTER 1 // center alignment
+#define VALIGN_TOP 2 // top alignment
#define ITEM_TEXTSTYLE_NORMAL 0 // normal text
#define ITEM_TEXTSTYLE_BLINK 1 // fast blinking
diff --git a/ui/mod.menu b/ui/mod.menu
index 88045167..38bee621 100644
--- a/ui/mod.menu
+++ b/ui/mod.menu
@@ -75,8 +75,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect (W-(2*BUTT_W)) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -94,8 +94,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/options.menu b/ui/options.menu
index eb9c823c..9959949d 100644
--- a/ui/options.menu
+++ b/ui/options.menu
@@ -52,9 +52,9 @@
cvar "name"
maxchars 26
rect X Y W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -67,9 +67,9 @@
cvar "ui_glCustom"
cvarFloatList { "High Quality" 0 "Normal" 1 "Fast" 2 "Fastest" 3 "Custom" 4 }
rect X (Y+ELEM_H) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -89,9 +89,9 @@
"800x600" 4 "960x720" 5 "1024x768" 6 "1152x864" 7
"1280x1024" 8 "1600x1200" 9 "2048x1536" 10 "856x480 wide screen" 11 }
rect X (Y+(2*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -108,9 +108,9 @@
text "Video Brightness:"
cvarfloat "r_gamma" 1 .5 2
rect X (Y+(3*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -124,9 +124,9 @@
text "Effects Volume:"
cvarfloat "s_volume" 0.7 0 1
rect X (Y+(4*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -138,9 +138,9 @@
text "Music Volume:"
cvarfloat "s_musicvolume" 0.25 0 1
rect X (Y+(5*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -152,9 +152,9 @@
text "OpenAL Sound:"
cvar "s_useOpenAL"
rect X (Y+(6*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -172,9 +172,9 @@
text "Mouse Sensitivity:"
cvarfloat "sensitivity" 5 1 30
rect X (Y+(7*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -186,9 +186,9 @@
text "Invert Mouse:"
cvar "ui_mousePitch"
rect X (Y+(8*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -208,9 +208,9 @@
cvar "rate"
cvarFloatList { "<=28.8k" 2500 "33.6k" 3000 "56k" 4000 "ISDN" 5000 "LAN/CABLE/xDSL" 25000 }
rect X (Y+(9*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -226,9 +226,9 @@
text "Allow Auto Download:"
cvar "cl_allowDownload"
rect X (Y+(10*ELEM_H)) W ELEM_H
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textalignx TOFF_X
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .25
forecolor 1 1 1 1
visible MENU_TRUE
@@ -246,8 +246,8 @@
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .25
rect 0 (H-60) W 10
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
decoration
@@ -261,8 +261,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect (W-(2*BUTT_W)) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -279,8 +279,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/password.menu b/ui/password.menu
index 1ac91cc3..54d642e8 100644
--- a/ui/password.menu
+++ b/ui/password.menu
@@ -57,8 +57,8 @@
type ITEM_TYPE_EDITFIELD
cvar "password"
rect BORDER BORDER (W-(2*BORDER)) INPUT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
}
@@ -71,8 +71,8 @@
textscale .25
style WINDOW_STYLE_EMPTY
rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/ptrc.menu b/ui/ptrc.menu
index c73e4b7d..ba744138 100644
--- a/ui/ptrc.menu
+++ b/ui/ptrc.menu
@@ -57,8 +57,8 @@
textscale .4
textstyle WINDOW_STYLE_SHADER
rect INFO_X INFO_Y INFO_W INFO_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
decoration
wrapped
forecolor 1 1 1 1
@@ -72,8 +72,8 @@
type ITEM_TYPE_BUTTON
textscale .4
rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -92,8 +92,8 @@
type ITEM_TYPE_BUTTON
textscale .4
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/quit.menu b/ui/quit.menu
index e3c6be24..6a6196ef 100644
--- a/ui/quit.menu
+++ b/ui/quit.menu
@@ -48,8 +48,8 @@
textscale .3
textstyle WINDOW_STYLE_SHADER
rect 0 0 W ((2*H)/3)
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
decoration
forecolor 1 1 1 1
visible MENU_TRUE
@@ -63,8 +63,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect 0 (H/3) (W/2) ((2*H)/3)
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -82,8 +82,8 @@
type ITEM_TYPE_BUTTON
textscale .25
rect (W/2) (H/3) (W/2) ((2*H)/3)
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/quitcredit.menu b/ui/quitcredit.menu
index e628026c..82b11069 100644
--- a/ui/quitcredit.menu
+++ b/ui/quitcredit.menu
@@ -12,6 +12,7 @@
focusColor 1 .75 0 1
style WINDOW_STYLE_FILLED
border WINDOW_BORDER_NONE
+ aspectBias ASPECT_NONE
onEsc
{
uiScript "quit"
@@ -65,7 +66,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 320 48 1 1
- textalign ITEM_ALIGN_CENTER
+ textalign ALIGN_CENTER
textscale 0.75
textstyle ITEM_TEXTSTYLE_NORMAL
text "CREDITS"
@@ -81,7 +82,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 96 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Tim 'Timbo' Angus"
@@ -96,7 +97,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 96 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Programming and Direction"
@@ -112,7 +113,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 128 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Nick 'jex' Jansens"
@@ -127,7 +128,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 128 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Mapping, texturing and 2D artwork"
@@ -143,7 +144,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 160 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Robin 'OverFlow' Marshall"
@@ -158,7 +159,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 160 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Modelling, animation and mapping"
@@ -174,7 +175,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 192 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Jan 'Stannum' van der Weg"
@@ -189,7 +190,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 192 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Texturing and mapping"
@@ -205,7 +206,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 224 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Mike 'Veda' McInerney"
@@ -220,7 +221,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 224 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Modelling, animation and texturing"
@@ -236,7 +237,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 256 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Gordon 'Godmil' Miller"
@@ -251,7 +252,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 256 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Mapping"
@@ -267,7 +268,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 288 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "'Who-[Soup]'"
@@ -282,7 +283,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 288 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Mapping"
@@ -298,7 +299,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 320 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Tristan 'jhrx' Blease"
@@ -313,7 +314,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 320 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Mapping"
@@ -329,7 +330,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 352 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Paul 'MoP' Greveson"
@@ -344,7 +345,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 352 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Modelling and texturing"
@@ -360,7 +361,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 10 384 1 1
- textalign ITEM_ALIGN_LEFT
+ textalign ALIGN_LEFT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Chris 'Dolby' McCarthy"
@@ -375,7 +376,7 @@
group grpidcredit
style WINDOW_STYLE_EMPTY
rect 630 384 1 1
- textalign ITEM_ALIGN_RIGHT
+ textalign ALIGN_RIGHT
textscale 0.50
textstyle ITEM_TEXTSTYLE_NORMAL
text "Sound"
diff --git a/ui/say.menu b/ui/say.menu
index 089b1fea..dea298c9 100644
--- a/ui/say.menu
+++ b/ui/say.menu
@@ -15,6 +15,7 @@
fullScreen MENU_FALSE
visible MENU_TRUE
rect X Y W H
+ aspectBias ALIGN_LEFT
focusColor 1 1 1 1
style WINDOW_STYLE_EMPTY
onOpen
@@ -31,8 +32,8 @@
cvar "ui_sayBuffer"
maxchars 128
rect 0 0 W H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textscale .5
forecolor 1 1 1 1
visible MENU_TRUE
diff --git a/ui/serverinfo.menu b/ui/serverinfo.menu
index 626788a6..04547b4f 100644
--- a/ui/serverinfo.menu
+++ b/ui/serverinfo.menu
@@ -61,10 +61,10 @@
notselectable
visible MENU_TRUE
columns 4
- 0 ((2*LEFT_C)*LIST_DW) ITEM_ALIGN_LEFT
- (LEFT_C*LIST_DW) (LEFT_C*LIST_DW) ITEM_ALIGN_LEFT
- ((2*LEFT_C)*LIST_DW) (LEFT_C*LIST_DW) ITEM_ALIGN_LEFT
- ((1-RIGHT_C)*LIST_DW) (RIGHT_C*LIST_DW) ITEM_ALIGN_LEFT
+ 0 ((2*LEFT_C)*LIST_DW) ALIGN_LEFT
+ (LEFT_C*LIST_DW) (LEFT_C*LIST_DW) ALIGN_LEFT
+ ((2*LEFT_C)*LIST_DW) (LEFT_C*LIST_DW) ALIGN_LEFT
+ ((1-RIGHT_C)*LIST_DW) (RIGHT_C*LIST_DW) ALIGN_LEFT
}
// BUTTON //
@@ -78,8 +78,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(2*BUTT_W)) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
@@ -98,8 +98,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
forecolor 1 1 1 1
visible MENU_TRUE
action
diff --git a/ui/teamscore.menu b/ui/teamscore.menu
index bf9f0f07..e1f96e1b 100644
--- a/ui/teamscore.menu
+++ b/ui/teamscore.menu
@@ -44,8 +44,8 @@
itemDef
{
name alienteamname
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx TOFF
textscale 0.4
rect 0 0 (W/3) BAR_H
@@ -58,8 +58,8 @@
itemDef
{
name stagereport
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale 0.33
rect (W/3) 0 (W/3) BAR_H
forecolor 1 1 1 1
@@ -71,8 +71,8 @@
itemDef
{
name humanteamname
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textalignx -TOFF
textscale 0.4
rect ((2*W)/3) 0 (W/3) BAR_H
@@ -121,8 +121,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (LLIST_L+10) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -135,8 +135,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (LLIST_L+50) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -149,8 +149,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (LLIST_R-95) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -163,8 +163,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (LLIST_R-55) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -177,8 +177,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (LLIST_R-15) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -191,8 +191,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (RLIST_L+10) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -205,8 +205,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (RLIST_L+50) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -219,8 +219,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (RLIST_R-95) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -233,8 +233,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (RLIST_R-55) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -247,8 +247,8 @@
textscale .33
style WINDOW_STYLE_EMPTY
rect (RLIST_R-15) (BAR_H+BORDER) 1 BAR_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
backcolor 0 0 0 0
forecolor 1 .75 0 1
decoration
@@ -274,13 +274,13 @@
feeder FEEDER_ALIENTEAM_LIST
notselectable
columns 7
- 5 15 ITEM_ALIGN_LEFT
- 21 15 ITEM_ALIGN_LEFT
- 7 30 ITEM_ALIGN_LEFT
- 45 ((W/2)-200) ITEM_ALIGN_LEFT
- ((W/2)-120) 20 ITEM_ALIGN_RIGHT
- ((W/2)-80) 20 ITEM_ALIGN_RIGHT
- ((W/2)-40) 20 ITEM_ALIGN_RIGHT
+ 5 15 ALIGN_LEFT
+ 21 15 ALIGN_LEFT
+ 7 30 ALIGN_LEFT
+ 45 ((W/2)-200) ALIGN_LEFT
+ ((W/2)-120) 20 ALIGN_RIGHT
+ ((W/2)-80) 20 ALIGN_RIGHT
+ ((W/2)-40) 20 ALIGN_RIGHT
}
itemDef
@@ -302,13 +302,13 @@
feeder FEEDER_HUMANTEAM_LIST
notselectable
columns 7
- 5 15 ITEM_ALIGN_LEFT
- 21 15 ITEM_ALIGN_LEFT
- 7 30 ITEM_ALIGN_LEFT
- 45 ((W/2)-200) ITEM_ALIGN_LEFT
- ((W/2)-120) 20 ITEM_ALIGN_RIGHT
- ((W/2)-80) 20 ITEM_ALIGN_RIGHT
- ((W/2)-40) 20 ITEM_ALIGN_RIGHT
+ 5 15 ALIGN_LEFT
+ 21 15 ALIGN_LEFT
+ 7 30 ALIGN_LEFT
+ 45 ((W/2)-200) ALIGN_LEFT
+ ((W/2)-120) 20 ALIGN_RIGHT
+ ((W/2)-80) 20 ALIGN_RIGHT
+ ((W/2)-40) 20 ALIGN_RIGHT
}
// spectators //
@@ -335,8 +335,8 @@
style WINDOW_STYLE_FILLED
forecolor 1 1 1 1
textscale .33
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textalignx TOFF
visible MENU_TRUE
decoration
@@ -349,7 +349,7 @@
style WINDOW_STYLE_FILLED
forecolor 1 1 1 1
textscale .33
- textvalign ITEM_VALIGN_CENTER
+ textvalign VALIGN_CENTER
visible MENU_TRUE
ownerdraw CG_SPECTATORS
decoration
diff --git a/ui/tremulous_alien_builder_hud.menu b/ui/tremulous_alien_builder_hud.menu
index 5274d707..e78eb0c4 100644
--- a/ui/tremulous_alien_builder_hud.menu
+++ b/ui/tremulous_alien_builder_hud.menu
@@ -11,6 +11,7 @@
fullScreen MENU_FALSE
visible MENU_TRUE
rect 0 0 W H
+ aspectBias ASPECT_NONE
#include "ui/tremulous_alien_common_hud.h"
#include "ui/tremulous_common_hud.h"
@@ -20,6 +21,7 @@
{
name "buildtimer"
rect 567 410 25 25
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor 1.0 0.0 0.0 .5
@@ -31,6 +33,7 @@
{
name "build-points"
rect 483.5 421.5 60 15
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor 1.0 0.0 0.0 .5
diff --git a/ui/tremulous_alien_common_hud.h b/ui/tremulous_alien_common_hud.h
index 6ac76733..321c00f0 100644
--- a/ui/tremulous_alien_common_hud.h
+++ b/ui/tremulous_alien_common_hud.h
@@ -11,6 +11,7 @@ itemDef
{
name "left-ring-circle"
rect 47.5 410 25 25
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -23,6 +24,7 @@ itemDef
{
name "left-arm"
rect 77 404.75 104 52.5
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -35,6 +37,7 @@ itemDef
{
name "left-arm-circle"
rect 150 417.5 25 25
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -47,6 +50,7 @@ itemDef
{
name "right-ring-circle"
rect 567 410 25 25
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -59,6 +63,7 @@ itemDef
{
name "right-arm"
rect 459 404.75 104 52.5
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -75,6 +80,7 @@ itemDef
{
name "bolt"
rect 52.5 412.5 15 20
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -87,6 +93,7 @@ itemDef
{
name "cross"
rect 155 422.5 15 15
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -99,6 +106,7 @@ itemDef
{
name "left-ring"
rect 7.25 369.5 90.5 106
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -111,6 +119,7 @@ itemDef
{
name "left-spikes"
rect 18.5 381 59 83
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 1.0
@@ -123,6 +132,7 @@ itemDef
{
name "right-ring"
rect 542.25 369.5 90.5 106
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -135,6 +145,7 @@ itemDef
{
name "right-spikes"
rect 562.5 381 59 83
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 1.0
@@ -147,6 +158,7 @@ itemDef
{
name "health"
rect 78.5 421.5 60 15
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B .5
@@ -158,6 +170,7 @@ itemDef
{
name "alien-icon"
rect 465 417.5 25 25
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.6
@@ -169,6 +182,7 @@ itemDef
{
name "organs"
rect 570.5 415.95 15 15
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B .5
diff --git a/ui/tremulous_alien_general_hud.menu b/ui/tremulous_alien_general_hud.menu
index 62e8af86..509a5993 100644
--- a/ui/tremulous_alien_general_hud.menu
+++ b/ui/tremulous_alien_general_hud.menu
@@ -11,6 +11,7 @@
fullScreen MENU_FALSE
visible MENU_TRUE
rect 0 0 W H
+ aspectBias ASPECT_NONE
#include "ui/tremulous_alien_common_hud.h"
#include "ui/tremulous_common_hud.h"
@@ -20,6 +21,7 @@
{
name "blob"
rect 479 419 57 18
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
forecolor 1.0 0.0 0.0 0.5
background "ui/assets/alien/tremublob.tga"
diff --git a/ui/tremulous_alienbuild.menu b/ui/tremulous_alienbuild.menu
index 522d17f5..127b769d 100644
--- a/ui/tremulous_alienbuild.menu
+++ b/ui/tremulous_alienbuild.menu
@@ -79,8 +79,8 @@
style WINDOW_STYLE_EMPTY
rect INFO_X INFO_Y INFO_W INFO_H
textscale .33
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx INFO_TOFF
textaligny INFO_TOFF
border WINDOW_BORDER_FULL
@@ -99,8 +99,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor 0 0 0 1
@@ -120,8 +120,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor 0 0 0 1
diff --git a/ui/tremulous_alienclass.menu b/ui/tremulous_alienclass.menu
index ad891757..441e27fd 100644
--- a/ui/tremulous_alienclass.menu
+++ b/ui/tremulous_alienclass.menu
@@ -79,8 +79,8 @@
style WINDOW_STYLE_EMPTY
rect INFO_X INFO_Y INFO_W INFO_H
textscale .33
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx INFO_TOFF
textaligny INFO_TOFF
border WINDOW_BORDER_FULL
@@ -99,8 +99,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect ((2*BORDER)+LIST_W) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -120,8 +120,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -141,8 +141,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
diff --git a/ui/tremulous_aliendialogs.menu b/ui/tremulous_aliendialogs.menu
index 159afb02..e3d4f05c 100644
--- a/ui/tremulous_aliendialogs.menu
+++ b/ui/tremulous_aliendialogs.menu
@@ -47,8 +47,8 @@
textstyle ITEM_TEXTSTYLE_NORMAL
style WINDOW_STYLE_EMPTY
rect BORDER BORDER INFO_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -64,8 +64,8 @@
rect INFO_X INFO_Y INFO_W INFO_H
cvar "ui_dialog"
wrapped
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .33
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -80,8 +80,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
diff --git a/ui/tremulous_alienupgrade.menu b/ui/tremulous_alienupgrade.menu
index d31b2832..2ef7bcb2 100644
--- a/ui/tremulous_alienupgrade.menu
+++ b/ui/tremulous_alienupgrade.menu
@@ -79,8 +79,8 @@
style WINDOW_STYLE_EMPTY
rect INFO_X INFO_Y INFO_W INFO_H
textscale .33
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx INFO_TOFF
textaligny INFO_TOFF
border WINDOW_BORDER_FULL
@@ -99,8 +99,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -120,8 +120,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
diff --git a/ui/tremulous_common_hud.h b/ui/tremulous_common_hud.h
index ae85d7e5..3bc62ba1 100644
--- a/ui/tremulous_common_hud.h
+++ b/ui/tremulous_common_hud.h
@@ -13,12 +13,13 @@ itemDef
{
name "console"
rect BORDER BORDER CONSOLE_W CONSOLE_H
+ aspectBias ALIGN_LEFT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor 1 1 1 1
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textscale 0.4
textstyle ITEM_TEXTSTYLE_NORMAL
ownerdraw CG_CONSOLE
@@ -29,12 +30,13 @@ itemDef
{
name "tutorial"
rect BORDER 250 MAIN_W 180
+ aspectBias ALIGN_LEFT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor 1 1 1 0.35
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textscale 0.3
textstyle ITEM_TEXTSTYLE_NORMAL
ownerdraw CG_TUTORIAL
@@ -45,12 +47,13 @@ itemDef
{
name "fps"
rect STAT_X BORDER STAT_W STAT_H
+ aspectBias ALIGN_RIGHT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 1
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale 0.3
textstyle ITEM_TEXTSTYLE_NORMAL
ownerdraw CG_FPS
@@ -60,12 +63,13 @@ itemDef
{
name "timer"
rect STAT_X ((2*BORDER)+STAT_H) STAT_W STAT_H
+ aspectBias ALIGN_RIGHT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 1
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale 0.3
textstyle ITEM_TEXTSTYLE_NORMAL
ownerdraw CG_TIMER
@@ -75,28 +79,27 @@ itemDef
{
name "lagometer"
rect STAT_X ((3*BORDER)+(2*STAT_H)) STAT_W STAT_H
+ aspectBias ALIGN_RIGHT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 1
textscale 0.3
- textalignx 1
- textaligny 0.5
ownerdraw CG_LAGOMETER
}
//CLOCK
itemDef
{
name "clock"
- rect 572 90 56 22
rect STAT_X ((4*BORDER)+(3*STAT_H)) STAT_W STAT_H
+ aspectBias ALIGN_RIGHT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 1
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
- textscale 0.25
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
+ textscale 0.3
textstyle ITEM_TEXTSTYLE_NORMAL
ownerdraw CG_CLOCK
}
@@ -105,13 +108,12 @@ itemDef
{
name "demoRecording"
rect (STAT_X+(STAT_W-32)) ((5*BORDER)+(4*STAT_H)) 32 32
+ aspectBias ALIGN_RIGHT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor 1 0 0 1
textscale 0.3
- textalignx 1
- textaligny 0.5
ownerdraw CG_DEMO_RECORDING
background "ui/assets/neutral/circle.tga"
}
@@ -119,13 +121,12 @@ itemDef
{
name "demoPlayback"
rect (STAT_X+(STAT_W-32)) ((5*BORDER)+(4*STAT_H)) 32 32
+ aspectBias ALIGN_RIGHT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor 1 1 1 1
textscale 0.3
- textalignx 1
- textaligny 0.5
ownerdraw CG_DEMO_PLAYBACK
background "ui/assets/forwardarrow.tga"
}
@@ -135,12 +136,13 @@ itemDef
{
name "snapshot"
rect BORDER (H-(BORDER+STAT_H)) MAIN_W STAT_H
+ aspectBias ALIGN_LEFT
style WINDOW_STYLE_EMPTY
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 1
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textscale 0.4
textstyle ITEM_TEXTSTYLE_NORMAL
ownerdraw CG_SNAPSHOT
@@ -151,6 +153,7 @@ itemDef
{
name "playername"
rect 200 275 240 25
+ aspectBias ALIGN_CENTER
visible MENU_TRUE
decoration
textScale .5
diff --git a/ui/tremulous_default_hud.menu b/ui/tremulous_default_hud.menu
index 02689861..6c98e519 100644
--- a/ui/tremulous_default_hud.menu
+++ b/ui/tremulous_default_hud.menu
@@ -11,6 +11,7 @@
fullScreen MENU_FALSE
visible MENU_TRUE
rect 0 0 W H
+ aspectBias ASPECT_NONE
#define COMMON_HUD_R 1.0
#define COMMON_HUD_G 1.0
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index 38354b4a..a2bdb82d 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -11,6 +11,7 @@
fullScreen MENU_FALSE
visible MENU_TRUE
rect 0 0 W H
+ aspectBias ASPECT_NONE
#define COMMON_HUD_R 0.0
#define COMMON_HUD_G 0.8
@@ -26,6 +27,7 @@
{
name "left-circle"
rect 35 417.5 25 25
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -38,6 +40,7 @@
{
name "left-arm"
rect 68.25 420 94.5 35
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -50,6 +53,7 @@
{
name "credits-label"
rect 508 403 7 7.5
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -62,6 +66,7 @@
{
name "right-circle"
rect 580 417.5 25 25
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -74,6 +79,7 @@
{
name "right-arm"
rect 477.25 420 94.5 35
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -86,6 +92,7 @@
{
name "right-cap"
rect 500 400 80 15
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
@@ -102,6 +109,7 @@
{
name "bolt"
rect 40 420 15 20
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -114,6 +122,7 @@
{
name "cross"
rect 137.5 430 15 15
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -126,6 +135,7 @@
{
name "stamina1"
rect 34.5 403.5 9 11.5
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -138,6 +148,7 @@
{
name "stamina2"
rect 24 410.75 11.5 10.5
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -150,6 +161,7 @@
{
name "stamina3"
rect 20.75 423.5 10.5 7
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -162,6 +174,7 @@
{
name "stamina4"
rect 21 402.5 54 55
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -175,6 +188,7 @@
name "ring"
//rect 20 402.5 55 55 // Guide for Stamina alignment
rect 565 402.5 55 55
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -187,6 +201,7 @@
{
name "credits"
rect 515 402 45 11.25
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -198,6 +213,7 @@
{
name "health"
rect 67 430 60 15
+ aspectBias ALIGN_LEFT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B .5
@@ -209,6 +225,7 @@
{
name "weapon"
rect 482.5 425 25 25
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -220,6 +237,7 @@
{
name "selecttext"
rect 200 300 240 25
+ aspectBias ALIGN_CENTER
visible MENU_TRUE
decoration
textScale .5
@@ -231,6 +249,7 @@
{
name "ammo"
rect 494 430 60 15
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B .5
@@ -242,6 +261,7 @@
{
name "clips"
rect 538 423 60 15
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B .5
@@ -253,6 +273,7 @@
{
name "buildtimer"
rect 580 417.5 25 25
+ aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B .5
@@ -264,6 +285,7 @@
{
name "usable"
rect 307.5 380 25 25
+ aspectBias ALIGN_CENTER
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B .5
@@ -276,6 +298,7 @@
{
name "scanner"
rect 164 340 312 72
+ aspectBias ALIGN_CENTER
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B .5
@@ -288,6 +311,7 @@
{
name "inventory"
rect 232.5 425 175 25
+ aspectBias ALIGN_CENTER
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
@@ -299,6 +323,7 @@
{
name "selected"
rect 306 424 27 27
+ aspectBias ALIGN_CENTER
visible MENU_TRUE
decoration
forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
diff --git a/ui/tremulous_humanarmoury.menu b/ui/tremulous_humanarmoury.menu
index 60bc70b1..4234259e 100644
--- a/ui/tremulous_humanarmoury.menu
+++ b/ui/tremulous_humanarmoury.menu
@@ -75,7 +75,9 @@
doubleclick
{
play "sound/misc/menu1.wav";
- uiScript BuyFromArmoury
+ uiScript BuyFromArmoury;
+ reset selllist;
+ reset buylist;
}
}
@@ -99,7 +101,9 @@
doubleclick
{
play "sound/misc/menu1.wav";
- uiScript SellToArmoury
+ uiScript SellToArmoury;
+ reset selllist;
+ reset buylist;
}
}
@@ -111,8 +115,8 @@
style WINDOW_STYLE_EMPTY
rect INFO_X INFO_Y INFO_W INFO_H
textscale .33
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx INFO_TOFF
textaligny INFO_TOFF
border WINDOW_BORDER_FULL
@@ -126,13 +130,13 @@
itemDef
{
- name "Sell"
- text "< Sell"
+ name "Buy"
+ text "Buy >"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect BUTT_X BUTT_Y BUTT_W BUTT_H
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -140,7 +144,9 @@
action
{
play "sound/misc/menu1.wav";
- uiScript SellToArmoury
+ uiScript BuyFromArmoury;
+ reset selllist;
+ reset buylist;
}
}
@@ -151,8 +157,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (BUTT_X+BUTT_W) BUTT_Y BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -166,13 +172,13 @@
itemDef
{
- name "Buy"
- text "Buy >"
+ name "Sell"
+ text "< Sell"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (BUTT_X+(2*BUTT_W)) BUTT_Y BUTT_W BUTT_H
- textalign ITEM_ALIGN_RIGHT
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -180,7 +186,9 @@
action
{
play "sound/misc/menu1.wav";
- uiScript BuyFromArmoury
+ uiScript SellToArmoury;
+ reset selllist;
+ reset buylist;
}
}
}
diff --git a/ui/tremulous_humanbuild.menu b/ui/tremulous_humanbuild.menu
index a2f84c85..572957bb 100644
--- a/ui/tremulous_humanbuild.menu
+++ b/ui/tremulous_humanbuild.menu
@@ -79,8 +79,8 @@
style WINDOW_STYLE_EMPTY
rect INFO_X INFO_Y INFO_W INFO_H
textscale .33
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx INFO_TOFF
textaligny INFO_TOFF
border WINDOW_BORDER_FULL
@@ -98,8 +98,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -119,8 +119,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
diff --git a/ui/tremulous_humandialogs.menu b/ui/tremulous_humandialogs.menu
index 8db2f027..bbaa70e3 100644
--- a/ui/tremulous_humandialogs.menu
+++ b/ui/tremulous_humandialogs.menu
@@ -48,8 +48,8 @@
textstyle ITEM_TEXTSTYLE_NORMAL
style WINDOW_STYLE_EMPTY
rect BORDER BORDER INFO_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -65,8 +65,8 @@
rect INFO_X INFO_Y INFO_W INFO_H
cvar "ui_dialog"
wrapped
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .33
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -81,8 +81,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
diff --git a/ui/tremulous_humanitem.menu b/ui/tremulous_humanitem.menu
index bc2204f6..551334be 100644
--- a/ui/tremulous_humanitem.menu
+++ b/ui/tremulous_humanitem.menu
@@ -79,8 +79,8 @@
style WINDOW_STYLE_EMPTY
rect INFO_X INFO_Y INFO_W INFO_H
textscale .33
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx INFO_TOFF
textaligny INFO_TOFF
border WINDOW_BORDER_FULL
@@ -99,8 +99,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect ((2*BORDER)+LIST_W) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -120,8 +120,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -141,8 +141,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
diff --git a/ui/tremulous_teamselect.menu b/ui/tremulous_teamselect.menu
index 7d638784..70512748 100644
--- a/ui/tremulous_teamselect.menu
+++ b/ui/tremulous_teamselect.menu
@@ -79,8 +79,8 @@
style WINDOW_STYLE_EMPTY
rect INFO_X INFO_Y INFO_W INFO_H
textscale .33
- textalign ITEM_ALIGN_LEFT
- textvalign ITEM_VALIGN_TOP
+ textalign ALIGN_LEFT
+ textvalign VALIGN_TOP
textalignx INFO_TOFF
textaligny INFO_TOFF
border WINDOW_BORDER_FULL
@@ -99,8 +99,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
@@ -120,8 +120,8 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
- textalign ITEM_ALIGN_CENTER
- textvalign ITEM_VALIGN_CENTER
+ textalign ALIGN_CENTER
+ textvalign VALIGN_CENTER
textscale .4
forecolor 1 1 1 1
backcolor .5 0 0 .25
generated by cgit (git 2.34.1) at 2024-12-24 18:15:10 +0000