qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-25 13:32:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Draw_Character -> Draw_Character8

Browse source 
Draw_String -> Draw_String8
Draw_Alt_String -> Draw_AltString8

You know what this means right?  Draw_*16 is coming soon.  Very soon.
This commit is contained in:
Joseph Carter 2000-06-05 01:05:25 +00:00
parent 9a348350df
commit a3e32e213e
11 changed files with 89 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/draw.h
View file

@ -34,7 +34,7 @@
extern qpic_t *draw_disc; // also used on sbar
void Draw_Init (void);
void Draw_Character (int x, int y, int num);
void Draw_Character8 (int x, int y, int num);
void Draw_DebugChar (char num);
void Draw_SubPic(int x, int y, qpic_t *pic, int srcx, int srcy, int width, int height);
void Draw_Pic (int x, int y, qpic_t *pic);
@ -46,8 +46,8 @@ void Draw_EndDisc (void);
void Draw_TileClear (int x, int y, int w, int h);
void Draw_Fill (int x, int y, int w, int h, int c);
void Draw_FadeScreen (void);
void Draw_String (int x, int y, char *str);
void Draw_Alt_String (int x, int y, char *str);
void Draw_String8 (int x, int y, char *str);
void Draw_AltString8 (int x, int y, char *str);
qpic_t *Draw_PicFromWad (char *name);
qpic_t *Draw_CachePic (char *path);
void Draw_Crosshair(void);

18
source/console.c
View file

@ -483,7 +483,7 @@ void Con_DrawInput (void)
y = con_vislines-22;
for (i=0 ; i<con_linewidth ; i++)
Draw_Character ( (i+1)<<3, con_vislines - 22, text[i]);
Draw_Character8 ( (i+1)<<3, con_vislines - 22, text[i]);
}
@ -520,7 +520,7 @@ void Con_DrawNotify (void)
scr_copytop = 1;
for (x = 0 ; x < con_linewidth ; x++)
Draw_Character ( (x+1)<<3, v, text[x]);
Draw_Character8 ( (x+1)<<3, v, text[x]);
v += 8;
}
@ -533,12 +533,12 @@ void Con_DrawNotify (void)
if (chat_team)
{
Draw_String (8, v, "say_team:");
Draw_String8 (8, v, "say_team:");
skip = 11;
}
else
{
Draw_String (8, v, "say:");
Draw_String8 (8, v, "say:");
skip = 5;
}
@ -548,10 +548,10 @@ void Con_DrawNotify (void)
x = 0;
while(s[x])
{
Draw_Character ( (x+skip)<<3, v, s[x]);
Draw_Character8 ( (x+skip)<<3, v, s[x]);
x++;
}
Draw_Character ( (x+skip)<<3, v, 10+((int)(realtime*con_cursorspeed)&1));
Draw_Character8 ( (x+skip)<<3, v, 10+((int)(realtime*con_cursorspeed)&1));
v += 8;
}
@ -593,7 +593,7 @@ void Con_DrawConsole (int lines)
{
// draw arrows to show the buffer is backscrolled
for (x=0 ; x<con_linewidth ; x+=4)
Draw_Character ( (x+1)<<3, y, '^');
Draw_Character8 ( (x+1)<<3, y, '^');
y -= 8;
rows--;
@ -610,7 +610,7 @@ void Con_DrawConsole (int lines)
text = con->text + (row % con_totallines)*con_linewidth;
for (x=0 ; x<con_linewidth ; x++)
Draw_Character ( (x+1)<<3, y, text[x]);
Draw_Character8 ( (x+1)<<3, y, text[x]);
}
// draw the download bar
@ -653,7 +653,7 @@ void Con_DrawConsole (int lines)
// draw it
y = con_vislines-22 + 8;
for (i = 0; i < strlen(dlbar); i++)
Draw_Character ( (i+1)<<3, y, dlbar[i]);
Draw_Character8 ( (i+1)<<3, y, dlbar[i]);
}

20
source/draw.c
View file

@ -143,14 +143,14 @@ void Draw_Init (void)
/*
================
Draw_Character
Draw_Character8
Draws one 8*8 graphics character with 0 being transparent.
It can be clipped to the top of the screen to allow the console to be
smoothly scrolled off.
================
*/
void Draw_Character (int x, int y, int num)
void Draw_Character8 (int x, int y, int num)
{
byte *dest;
byte *source;
@ -241,14 +241,14 @@ void Draw_Character (int x, int y, int num)
/*
================
Draw_String
Draw_String8
================
*/
void Draw_String (int x, int y, char *str)
void Draw_String8 (int x, int y, char *str)
{
while (*str)
{
Draw_Character (x, y, *str);
Draw_Character8 (x, y, *str);
str++;
x += 8;
}
@ -256,14 +256,14 @@ void Draw_String (int x, int y, char *str)
/*
================
Draw_Alt_String
Draw_AltString8
================
*/
void Draw_Alt_String (int x, int y, char *str)
void Draw_AltString8 (int x, int y, char *str)
{
while (*str)
{
Draw_Character (x, y, (*str) | 0x80);
Draw_Character8 (x, y, (*str) | 0x80);
str++;
x += 8;
}
@ -307,7 +307,7 @@ void Draw_Crosshair(void)
Draw_Pixel(x, y + 1, c);
Draw_Pixel(x, y + 3, c);
} else if (crosshair->value)
Draw_Character (
Draw_Character8 (
scr_vrect.x + scr_vrect.width/2-4 + cl_crossx->value,
scr_vrect.y + scr_vrect.height/2-4 + cl_crossy->value,
'+');
@ -703,7 +703,7 @@ void Draw_ConsoleBackground (int lines)
}
}
Draw_Alt_String (vid.conwidth - strlen(cl_verstring->string)*8 - 11,
Draw_AltString8 (vid.conwidth - strlen(cl_verstring->string)*8 - 11,
lines-14, cl_verstring->string);
}

20
source/gl_draw.c
View file

@ -448,14 +448,14 @@ void Draw_Init (void)
/*
================
Draw_Character
Draw_Character8
Draws one 8*8 graphics character with 0 being transparent.
It can be clipped to the top of the screen to allow the console to be
smoothly scrolled off.
================
*/
void Draw_Character (int x, int y, int num)
void Draw_Character8 (int x, int y, int num)
{
int row, col;
float frow, fcol, size;
@ -492,14 +492,14 @@ void Draw_Character (int x, int y, int num)
/*
================
Draw_String
Draw_String8
================
*/
void Draw_String (int x, int y, char *str)
void Draw_String8 (int x, int y, char *str)
{
while (*str)
{
Draw_Character (x, y, *str);
Draw_Character8 (x, y, *str);
str++;
x += 8;
}
@ -507,14 +507,14 @@ void Draw_String (int x, int y, char *str)
/*
================
Draw_Alt_String
Draw_AltString8
================
*/
void Draw_Alt_String (int x, int y, char *str)
void Draw_AltString8 (int x, int y, char *str)
{
while (*str)
{
Draw_Character (x, y, (*str) | 0x80);
Draw_Character8 (x, y, (*str) | 0x80);
str++;
x += 8;
}
@ -546,7 +546,7 @@ void Draw_Crosshair(void)
glEnd ();
} else if (crosshair->value)
Draw_Character (scr_vrect.x + scr_vrect.width/2-4 + cl_crossx->value,
Draw_Character8 (scr_vrect.x + scr_vrect.width/2-4 + cl_crossx->value,
scr_vrect.y + scr_vrect.height/2-4 + cl_crossy->value, '+');
}
@ -802,7 +802,7 @@ Draw_ConsoleBackground ( int lines )
// draw version string if not downloading
if (!cls.download)
Draw_Alt_String (vid.conwidth - strlen(cl_verstring->string)*8 - 11,
Draw_AltString8 (vid.conwidth - strlen(cl_verstring->string)*8 - 11,
lines-14, cl_verstring->string);
}

2
source/gl_ngraph.c
View file

@ -146,7 +146,7 @@ void R_NetGraph (void)
y += 8;
sprintf(st, "%3i%% packet loss", lost);
Draw_String(8, y, st);
Draw_String8 (8, y, st);
y += 8;
GL_Bind(netgraphtexture);

4
source/gl_rmain.c
View file

@ -792,8 +792,9 @@ void R_PolyBlend (void)
glRotatef (-90, 1, 0, 0); // put Z going up
glRotatef (90, 0, 0, 1); // put Z going up
glBlendFunc (GL_SRC_ALPHA, GL_ONE);
// software alpha is about GL alpha squared --KB
v_blend[3] = sqrt(v_blend[3]);
// v_blend[3] = sqrt(v_blend[3]);
glColor4fv (v_blend);
@ -805,6 +806,7 @@ void R_PolyBlend (void)
glEnd ();
glEnable (GL_TEXTURE_2D);
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
}

7
source/gl_screen.c
View file

@ -231,7 +231,7 @@ void SCR_DrawCenterString (void)
x = (vid.width - l*8)/2;
for (j=0 ; j<l ; j++, x+=8)
{
Draw_Character (x, y, start[j]);
Draw_Character8 (x, y, start[j]);
if (!remaining--)
return;
}
@ -527,8 +527,7 @@ void SCR_DrawFPS (void)
sprintf(st, "%3d FPS", lastfps);
x = vid.width - strlen(st) * 8 - 8;
y = vid.height - sb_lines - 8;
// Draw_TileClear(x, y, strlen(st) * 8, 8);
Draw_String(x, y, st);
Draw_String8 (x, y, st);
}
@ -1022,7 +1021,7 @@ void SCR_DrawNotifyString (void)
break;
x = (vid.width - l*8)/2;
for (j=0 ; j<l ; j++, x+=8)
Draw_Character (x, y, start[j]);
Draw_Character8 (x, y, start[j]);
y += 8;

2
source/menu.c
View file

@ -135,7 +135,7 @@ Draws one solid graphics character
*/
void M_DrawCharacter (int cx, int line, int num)
{
Draw_Character ( cx + ((vid.width - 320)>>1), line, num);
Draw_Character8 ( cx + ((vid.width - 320)>>1), line, num);
}
void M_Print (int cx, int cy, char *str)

2
source/r_misc.c
View file

@ -279,7 +279,7 @@ void R_NetGraph (void)
R_LineGraph (x+w-1-a, y, packet_latency[i]);
}
sprintf(st, "%3i%% packet loss", lost);
Draw_String(8, y2, st);
Draw_String8 (8, y2, st);
}
/*

90
source/sbar.c
View file

@ -287,7 +287,7 @@ Draws one solid graphics character
*/
void Sbar_DrawCharacter (int x, int y, int num)
{
Draw_Character ( x /*+ ((vid.width - 320)>>1) */ + 4, y + vid.height-SBAR_HEIGHT, num);
Draw_Character8 ( x /*+ ((vid.width - 320)>>1) */ + 4, y + vid.height-SBAR_HEIGHT, num);
}
/*
@ -297,7 +297,7 @@ Sbar_DrawString
*/
void Sbar_DrawString (int x, int y, char *str)
{
Draw_String (x /*+ ((vid.width - 320)>>1) */, y+ vid.height-SBAR_HEIGHT, str);
Draw_String8 (x /*+ ((vid.width - 320)>>1) */, y+ vid.height-SBAR_HEIGHT, str);
}
/*
@ -949,10 +949,10 @@ void Sbar_TeamOverlay (void)
y = 24;
x = 36;
Draw_String(x, y, "low/avg/high team total players");
Draw_String8 (x, y, "low/avg/high team total players");
y += 8;
// Draw_String(x, y, "------------ ---- ----- -------");
Draw_String(x, y, "\x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f \x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1e\x1e\x1f");
// Draw_String8 (x, y, "------------ ---- ----- -------");
Draw_String8 (x, y, "\x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f \x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1e\x1e\x1f");
y += 8;
// sort the teams
@ -981,25 +981,25 @@ void Sbar_TeamOverlay (void)
pavg = 999;
sprintf (num, "%3i/%3i/%3i", plow, pavg, phigh);
Draw_String ( x, y, num);
Draw_String8 ( x, y, num);
// draw team
team[4] = 0;
strncpy (team, tm->team, 4);
Draw_String (x + 104, y, team);
Draw_String8 (x + 104, y, team);
// draw total
sprintf (num, "%5i", tm->frags);
Draw_String (x + 104 + 40, y, num);
Draw_String8 (x + 104 + 40, y, num);
// draw players
sprintf (num, "%5i", tm->players);
Draw_String (x + 104 + 88, y, num);
Draw_String8 (x + 104 + 88, y, num);
if (!strncmp(Info_ValueForKey(cl.players[cl.playernum].userinfo,
"team"), tm->team, 16)) {
Draw_Character ( x + 104 - 8, y, 16);
Draw_Character ( x + 104 + 32, y, 17);
Draw_Character8 ( x + 104 - 8, y, 16);
Draw_Character8 ( x + 104 + 32, y, 17);
}
y += 8;
@ -1065,20 +1065,20 @@ void Sbar_DeathmatchOverlay (int start)
{
x = 4;
// 0 40 64 104 152 192
Draw_String ( x , y, "ping pl time frags team name");
Draw_String8 ( x , y, "ping pl time frags team name");
y += 8;
// Draw_String ( x , y, "---- -- ---- ----- ---- ----------------");
Draw_String ( x , y, "\x1d\x1e\x1e\x1f \x1d\x1f \x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1f \x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f");
// Draw_String8 ( x , y, "---- -- ---- ----- ---- ----------------");
Draw_String8 ( x , y, "\x1d\x1e\x1e\x1f \x1d\x1f \x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1f \x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f");
y += 8;
}
else
{
x = 16;
// 0 40 64 104 152
Draw_String ( x , y, "ping pl time frags name");
Draw_String8 ( x , y, "ping pl time frags name");
y += 8;
// Draw_String ( x , y, "---- -- ---- ----- ----------------");
Draw_String ( x , y, "\x1d\x1e\x1e\x1f \x1d\x1f \x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f");
// Draw_String8 ( x , y, "---- -- ---- ----- ----------------");
Draw_String8 ( x , y, "\x1d\x1e\x1e\x1f \x1d\x1f \x1d\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1f \x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f");
y += 8;
}
@ -1094,24 +1094,24 @@ void Sbar_DeathmatchOverlay (int start)
if (p < 0 || p > 999)
p = 999;
sprintf (num, "%4i", p);
Draw_String ( x, y, num);
Draw_String8 ( x, y, num);
// draw pl
p = s->pl;
sprintf (num, "%3i", p);
if (p > 25)
Draw_Alt_String ( x+32, y, num);
Draw_AltString8 ( x+32, y, num);
else
Draw_String ( x+32, y, num);
Draw_String8 ( x+32, y, num);
if (s->spectator)
{
Draw_String (x+40, y, "(spectator)");
Draw_String8 (x+40, y, "(spectator)");
// draw name
if (teamplay)
Draw_String (x+152+40, y, s->name);
Draw_String8 (x+152+40, y, s->name);
else
Draw_String (x+152, y, s->name);
Draw_String8 (x+152, y, s->name);
y += skip;
continue;
}
@ -1124,7 +1124,7 @@ void Sbar_DeathmatchOverlay (int start)
total = realtime - s->entertime;
minutes = (int)total/60;
sprintf (num, "%4i", minutes);
Draw_String ( x+64 , y, num);
Draw_String8 ( x+64 , y, num);
// draw background
top = s->topcolor;
@ -1142,14 +1142,14 @@ void Sbar_DeathmatchOverlay (int start)
f = s->frags;
sprintf (num, "%3i",f);
Draw_Character ( x+112 , y, num[0]);
Draw_Character ( x+120 , y, num[1]);
Draw_Character ( x+128 , y, num[2]);
Draw_Character8 ( x+112 , y, num[0]);
Draw_Character8 ( x+120 , y, num[1]);
Draw_Character8 ( x+128 , y, num[2]);
if (k == cl.playernum)
{
Draw_Character ( x + 104, y, 16);
Draw_Character ( x + 136, y, 17);
Draw_Character8 ( x + 104, y, 16);
Draw_Character8 ( x + 136, y, 17);
}
// team
@ -1157,14 +1157,14 @@ void Sbar_DeathmatchOverlay (int start)
{
team[4] = 0;
strncpy (team, Info_ValueForKey(s->userinfo, "team"), 4);
Draw_String (x+152, y, team);
Draw_String8 (x+152, y, team);
}
// draw name
if (teamplay)
Draw_String (x+152+40, y, s->name);
Draw_String8 (x+152+40, y, s->name);
else
Draw_String (x+152, y, s->name);
Draw_String8 (x+152, y, s->name);
y += skip;
}
@ -1254,14 +1254,14 @@ void Sbar_MiniDeathmatchOverlay (void)
f = s->frags;
sprintf (num, "%3i",f);
Draw_Character ( x+8 , y, num[0]);
Draw_Character ( x+16, y, num[1]);
Draw_Character ( x+24, y, num[2]);
Draw_Character8 ( x+8 , y, num[0]);
Draw_Character8 ( x+16, y, num[1]);
Draw_Character8 ( x+24, y, num[2]);
if (k == cl.playernum)
{
Draw_Character ( x, y, 16);
Draw_Character ( x + 32, y, 17);
Draw_Character8 ( x, y, 16);
Draw_Character8 ( x + 32, y, 17);
}
// team
@ -1269,16 +1269,16 @@ void Sbar_MiniDeathmatchOverlay (void)
{
team[4] = 0;
strncpy (team, Info_ValueForKey(s->userinfo, "team"), 4);
Draw_String (x+48, y, team);
Draw_String8 (x+48, y, team);
}
// draw name
name[16] = 0;
strncpy(name, s->name, 16);
if (teamplay)
Draw_String (x+48+40, y, name);
Draw_String8 (x+48+40, y, name);
else
Draw_String (x+48, y, name);
Draw_String8 (x+48, y, name);
y += 8;
}
@ -1289,7 +1289,7 @@ void Sbar_MiniDeathmatchOverlay (void)
// draw seperator
x += 208;
for (y = vid.height - sb_lines; y < vid.height - 6; y += 2)
Draw_Character(x, y, 14);
Draw_Character8 (x, y, 14);
x += 16;
@ -1302,16 +1302,16 @@ void Sbar_MiniDeathmatchOverlay (void)
// draw pings
team[4] = 0;
strncpy (team, tm->team, 4);
Draw_String (x, y, team);
Draw_String8 (x, y, team);
// draw total
sprintf (num, "%5i", tm->frags);
Draw_String (x + 40, y, num);
Draw_String8 (x + 40, y, num);
if (!strncmp(Info_ValueForKey(cl.players[cl.playernum].userinfo,
"team"), tm->team, 16)) {
Draw_Character ( x - 8, y, 16);
Draw_Character ( x + 32, y, 17);
Draw_Character8 ( x - 8, y, 16);
Draw_Character8 ( x + 32, y, 17);
}
y += 8;

7
source/screen.c
View file

@ -253,7 +253,7 @@ void SCR_DrawCenterString (void)
x = (vid.width - l*8)/2;
for (j=0 ; j<l ; j++, x+=8)
{
Draw_Character (x, y, start[j]);
Draw_Character8 (x, y, start[j]);
if (!remaining--)
return;
}
@ -570,8 +570,7 @@ void SCR_DrawFPS (void)
sprintf(st, "%3d FPS", lastfps);
x = vid.width - strlen(st) * 8 - 8;
y = vid.height - sb_lines - 8;
// Draw_TileClear(x, y, strlen(st) * 8, 8);
Draw_String(x, y, st);
Draw_String8 (x, y, st);
}
/*
@ -1025,7 +1024,7 @@ void SCR_DrawNotifyString (void)
break;
x = (vid.width - l*8)/2;
for (j=0 ; j<l ; j++, x+=8)
Draw_Character (x, y, start[j]);
Draw_Character8 (x, y, start[j]);
y += 8;