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

Merged gl_draw.c! Yes, the version string is unscaled.

Browse source
This commit is contained in:
Joseph Carter 2000-01-02 15:53:47 +00:00
parent e02e3a8982
commit 6d9ae5f2ef
3 changed files with 10 additions and 1345 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AUTHORS
View file

@ -16,13 +16,14 @@ QW/Q1 tree merging:
Bill Currie <bill@taniwha.org> Bill Currie <bill@taniwha.org>
Nelson J. Rush <chesterrr@att.net> Nelson J. Rush <chesterrr@att.net>
Eric Windisch <windisch@nni.com> Eric Windisch <windisch@nni.com>
Joseph Carter <knghtbrd@debian.org>
Autoconf support: Autoconf support:
Loring Holden <lsh@cs.brown.edu> Loring Holden <lsh@cs.brown.edu>
Joseph Carter <knghtbrd@debian.org> Joseph Carter <knghtbrd@debian.org>
Bill Currie <bill@taniwha.org> Bill Currie <bill@taniwha.org>
Cesar Eduardo Barros <cesarb@web4u.com.br> Cesar Eduardo Barros <cesarb@web4u.com.br>
Marcus Sundber <mackan@stacken.kth.se> Marcus Sundberg <mackan@stacken.kth.se>
Peter Andreasen <pandr@pandr.dk> Peter Andreasen <pandr@pandr.dk>
Sound cleanups: Sound cleanups:

43
qw_client/gl_draw.c → common/gl_draw.c
View file

@ -279,30 +279,6 @@ qpic_t *Draw_CachePic (char *path)
} }
void Draw_CharToConback (int num, byte *dest)
{
int row, col;
byte *source;
int drawline;
int x;
row = num>>4;
col = num&15;
source = draw_chars + (row<<10) + (col<<3);
drawline = 8;
while (drawline--)
{
for (x=0 ; x<8 ; x++)
if (source[x] != 255)
dest[x] = 0x60 + source[x];
source += 128;
dest += 320;
}
}
typedef struct typedef struct
{ {
char *name; char *name;
@ -414,10 +390,12 @@ void Draw_Init (void)
Sys_Error ("Couldn't load gfx/conback.lmp"); Sys_Error ("Couldn't load gfx/conback.lmp");
SwapPic (cb); SwapPic (cb);
#ifdef SCALEVER
sprintf (ver, VERSION); sprintf (ver, VERSION);
dest = cb->data + 320 + 320*186 - 11 - 8*strlen(ver); dest = cb->data + 320 + 320*186 - 11 - 8*strlen(ver);
for (x=0 ; x<strlen(ver) ; x++) for (x=0 ; x<strlen(ver) ; x++)
Draw_CharToConback (ver[x], dest+(x<<3)); Draw_CharToConback (ver[x], dest+(x<<3));
#endif
#if 0 #if 0
conback->width = vid.conwidth; conback->width = vid.conwidth;
@ -558,6 +536,7 @@ void Draw_Alt_String (int x, int y, char *str)
} }
} }
#ifdef QUAKEWORLD
void Draw_Crosshair(void) void Draw_Crosshair(void)
{ {
int x, y; int x, y;
@ -590,6 +569,7 @@ void Draw_Crosshair(void)
scr_vrect.y + scr_vrect.height/2-4 + cl_crossy.value, scr_vrect.y + scr_vrect.height/2-4 + cl_crossy.value,
'+'); '+');
} }
#endif
/* /*
@ -791,18 +771,11 @@ void Draw_ConsoleBackground (int lines)
Draw_AlphaPic (0, lines - vid.height, conback, (float)(1.2 * lines)/y); Draw_AlphaPic (0, lines - vid.height, conback, (float)(1.2 * lines)/y);
// hack the version number directly into the pic // hack the version number directly into the pic
// y = lines-186;
y = lines-14; y = lines-14;
if (!cls.download) { sprintf (ver, "QuakeForge (GL) " VERSION);
#ifdef __linux__ x = vid.conwidth - (strlen(ver)*8 + 11);
sprintf (ver, "QuakeForge (LinuxGL QuakeWorld) " VERSION); for (i=0 ; i<strlen(ver) ; i++)
#else Draw_Character (x + i * 8, y, ver[i] | 0x80);
sprintf (ver, "QuakeForge (GL QuakeWorld) " VERSION);
#endif
x = vid.conwidth - (strlen(ver)*8 + 11) - (vid.conwidth*8/320)*7;
for (i=0 ; i<strlen(ver) ; i++)
Draw_Character (x + i * 8, y, ver[i] | 0x80);
}
} }

1309
uquake/gl_draw.c
View file

File diff suppressed because it is too large Load diff