qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

tidy up Draw_String calls and switched to Draw_nString were needed

Browse source
This commit is contained in:
Chris Ison 2002-01-10 03:54:00 +00:00
parent f01cc24267
commit 859c18dc07
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/video/renderer/gl/gl_draw.c
View file

@ -351,7 +351,6 @@ Draw_nString (int x, int y, const char *str, int count)
{
unsigned char num;
float frow, fcol;
int size;
if (!str || !str[0])
return;
@ -361,7 +360,7 @@ Draw_nString (int x, int y, const char *str, int count)
qfglBindTexture (GL_TEXTURE_2D, char_texture);
qfglBegin (GL_QUADS);
for (size = 0; size < count; size++, x+=8) {
while (count-- && *str) {
if ((num = *str++) != 32) // Don't render spaces
{
frow = (num >> 4) * CELL_SIZE;
@ -376,6 +375,7 @@ Draw_nString (int x, int y, const char *str, int count)
qfglTexCoord2f (fcol, frow + CELL_SIZE);
qfglVertex2f (x, y + 8);
}
x+=8;
}
qfglEnd ();
}

29
qw/source/sbar.c
View file

@ -803,7 +803,7 @@ Sbar_IntermissionNumber (int x, int y, int num, int digits, int color)
void
Sbar_TeamOverlay (void)
{
char num[12], team[5];
char num[12];
int pavg, plow, phigh, i, k, l, x, y;
qpic_t *pic;
team_t *tm;
@ -858,9 +858,7 @@ Sbar_TeamOverlay (void)
Draw_String (x, y, num);
// draw team
team[4] = 0;
strncpy (team, tm->team, 4);
Draw_String (x + 104, y, team);
Draw_nString (x + 104, y, tm->team, 4);
// draw total
snprintf (num, sizeof (num), "%5i", tm->frags);
@ -889,7 +887,7 @@ Sbar_TeamOverlay (void)
void
Sbar_DeathmatchOverlay (int start)
{
char num[12], team[5];
char num[12];
int minutes, total, top, bottom, f, i, k, l, p, x, y;
int skip = 10;
player_info_t *s;
@ -1023,9 +1021,7 @@ Sbar_DeathmatchOverlay (int start)
}
// team
if (cl.teamplay) {
team[4] = 0;
strncpy (team, s->team->value, 4);
Draw_String (x + 152, y, team);
Draw_nString (x + 152, y, s->team->value, 4);
}
// draw name
if (cl.teamplay)
@ -1051,7 +1047,7 @@ void
Sbar_MiniDeathmatchOverlay (void)
{
int numlines, top, bottom, f, i, k, x, y;
char name[16 + 1], num[12], team[5];
char num[12];
player_info_t *s;
team_t *tm;
@ -1120,17 +1116,13 @@ Sbar_MiniDeathmatchOverlay (void)
}
// team
if (cl.teamplay) {
team[4] = 0;
strncpy (team, s->team->value, 4);
Draw_String (x + 48, y, s->team->value);
Draw_nString (x + 48, y, s->team->value, 4);
}
// draw name
name[16] = 0;
strncpy (name, s->name, 16);
if (cl.teamplay)
Draw_String (x + 48 + 40, y, name);
Draw_String (x + 48 + 40, y, s->name);
else
Draw_String (x + 48, y, name);
Draw_String (x + 48, y, s->name);
y += 8;
}
@ -1152,10 +1144,7 @@ Sbar_MiniDeathmatchOverlay (void)
tm = teams + k;
// draw pings
team[4] = 0;
strncpy (team, tm->team, 4);
Draw_String (x, y, team);
Draw_nString (x, y, tm->team, 4);
// draw total
snprintf (num, sizeof (num), "%5i", tm->frags);
Draw_String (x + 40, y, num);