diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-05 18:17:46 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-05 18:17:46 +0000 |
| commit | d37536edf4660f3c46e4876b6d72e9a200549ffe (patch) | |
| tree | 637eb5f3e49f4075ecdef97a31f5e8157cee73a2 /code/q3_ui/ui_atoms.c | |
| parent | 4496eacc4ec7406fd694693da5a7f9589933f7fd (diff) | |
| download | ioquake3-aero-d37536edf4660f3c46e4876b6d72e9a200549ffe.tar.gz ioquake3-aero-d37536edf4660f3c46e4876b6d72e9a200549ffe.zip | |
* Merge unified-sdl to trunk
* Bump Q3_VERSION to 1.35
git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/q3_ui/ui_atoms.c')
| -rw-r--r-- | code/q3_ui/ui_atoms.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/code/q3_ui/ui_atoms.c b/code/q3_ui/ui_atoms.c index 3ae12e0..e66996d 100644 --- a/code/q3_ui/ui_atoms.c +++ b/code/q3_ui/ui_atoms.c @@ -330,8 +330,6 @@ static int propMapB[26][3] = { #define PROPB_SPACE_WIDTH 12 #define PROPB_HEIGHT 36 -// bk001205 - code below duplicated in cgame/cg_drawtools.c -// bk001205 - FIXME: does this belong in ui_shared.c? /* ================= UI_DrawBannerString @@ -340,7 +338,7 @@ UI_DrawBannerString static void UI_DrawBannerString2( int x, int y, const char* str, vec4_t color ) { const char* s; - unsigned char ch; // bk001204 - unsigned + unsigned char ch; float ax; float ay; float aw; @@ -450,10 +448,10 @@ int UI_ProportionalStringWidth( const char* str ) { static void UI_DrawProportionalString2( int x, int y, const char* str, vec4_t color, float sizeScale, qhandle_t charset ) { const char* s; - unsigned char ch; // bk001204 - unsigned + unsigned char ch; float ax; float ay; - float aw = 0; // bk001204 - init + float aw = 0; float ah; float frow; float fcol; @@ -831,7 +829,6 @@ void UI_SetActiveMenu( uiMenuCommand_t menu ) { UI_InGameMenu(); return; - // bk001204 case UIMENU_TEAM: case UIMENU_POSTGAME: default: |