summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2009-10-22 08:25:20 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:17:00 +0000
commit0cc4070263c9159760901dcb5e2b1ac6d97de86f (patch)
treeb5113e43fefc69c6d6c0ad00ee1ccac8f144e9f2 /assets
parent3c9a869327aecda255ffc48ba7a7f4bcf6b4544e (diff)
* Fix UI_Text_Paint_Limit() function, which was printing a max of one character ever, but nothing was using it so nobody noticed (thanks Oopss)
* Add ALIGN_NONE and VALIGN_NONE types for CG_Text_Align function * Slightly widen the location item on the default hud, since just a little bit more fits most maps better * Prevent seeing crosshair playername text for players on the other team while in SPECTATOR_LOCKED * Fix formatting nitpick from a few revisions ago
Diffstat (limited to 'assets')
-rw-r--r--assets/ui/menudef.h7
-rw-r--r--assets/ui/tremulous_common_hud.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/assets/ui/menudef.h b/assets/ui/menudef.h
index 3adc8a1a..7e5074f7 100644
--- a/assets/ui/menudef.h
+++ b/assets/ui/menudef.h
@@ -21,19 +21,22 @@ enum
ITEM_TYPE_BIND // keyboard control configuration
};
+// The first items in these enums are the defaults if menus do not specify
enum
{
ALIGN_LEFT, // left alignment
ALIGN_CENTER, // center alignment
ALIGN_RIGHT, // right alignment
- ASPECT_NONE // no aspect compensation
+ ASPECT_NONE, // no aspect compensation
+ ALIGN_NONE
};
enum
{
VALIGN_BOTTOM, // bottom alignment
VALIGN_CENTER, // center alignment
- VALIGN_TOP // top alignment
+ VALIGN_TOP, // top alignment
+ VALIGN_NONE
};
enum
diff --git a/assets/ui/tremulous_common_hud.h b/assets/ui/tremulous_common_hud.h
index 4ef4dbb9..d4c69f08 100644
--- a/assets/ui/tremulous_common_hud.h
+++ b/assets/ui/tremulous_common_hud.h
@@ -127,7 +127,7 @@ itemDef
itemDef
{
name "location"
- rect (STAT_X-60) ((4*BORDER)+(4*STAT_H)) (STAT_W+60) STAT_H
+ rect (STAT_X-75) ((4*BORDER)+(4*STAT_H)) (STAT_W+75) STAT_H
aspectBias ALIGN_RIGHT
visible MENU_TRUE
decoration