From 0cc4070263c9159760901dcb5e2b1ac6d97de86f Mon Sep 17 00:00:00 2001 From: Christopher Schwarz Date: Thu, 22 Oct 2009 08:25:20 +0000 Subject: * 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 --- assets/ui/menudef.h | 7 +++++-- assets/ui/tremulous_common_hud.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'assets') 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 -- cgit