qf
/
quakeforge-old
mirror of https://git.code.sf.net/p/quake/quakeforge-old
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Several updates that are going into 0.1.1---please feel free to test!

This commit is contained in:
Joseph Carter 2000-02-21 00:28:23 +00:00
parent 259b41b6f9
commit b4112d0eca
8 changed files with 1357 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/draw.c
View File

@ -630,9 +630,9 @@ void Draw_ConsoleBackground (int lines)
qpic_t *conback; qpic_t *conback;
static char saveback[320*8]; static char saveback[320*8];
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
char ver[] = "QuakeForge (Software QW) " QF_VERSION; char ver[] = "QuakeForge (QuakeWorld) " QF_VERSION;
#else #else
char ver[] = "QuakeForge (Software UQ) " QF_VERSION; char ver[] = "QuakeForge (\"Quack\" Commemorative Edition) " QF_VERSION;
#endif #endif
conback = Draw_CachePic ("gfx/conback.lmp"); conback = Draw_CachePic ("gfx/conback.lmp");

8
common/gl_draw.c
View File

@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h" #include "quakedef.h"
#define HIPFIX
extern unsigned char d_15to8table[65536]; extern unsigned char d_15to8table[65536];
extern cvar_t crosshair, cl_crossx, cl_crossy, crosshaircolor; extern cvar_t crosshair, cl_crossx, cl_crossy, crosshaircolor;
@ -222,6 +224,7 @@ qpic_t *Draw_PicFromWad (char *name)
p = W_GetLumpName (name); p = W_GetLumpName (name);
gl = (glpic_t *)p->data; gl = (glpic_t *)p->data;
#ifndef HIPFIX
// load little ones into the scrap // load little ones into the scrap
if (p->width < 64 && p->height < 64) if (p->width < 64 && p->height < 64)
{ {
@ -246,6 +249,7 @@ qpic_t *Draw_PicFromWad (char *name)
pic_texels += p->width*p->height; pic_texels += p->width*p->height;
} }
else else
#endif
{ {
gl->texnum = GL_LoadPicTexture (p); gl->texnum = GL_LoadPicTexture (p);
gl->sl = 0; gl->sl = 0;
@ -810,9 +814,9 @@ Draw_ConsoleBackground
void Draw_ConsoleBackground (int lines) void Draw_ConsoleBackground (int lines)
{ {
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
char ver[] = "QuakeForge (GL QW) " QF_VERSION; char ver[] = "QuakeForge (QuakeWorld) " QF_VERSION;
#else #else
char ver[] = "QuakeForge (GL UQ) " QF_VERSION; char ver[] = "QuakeForge (\"Quack\" Commemorative Edition) " QF_VERSION;
#endif #endif
int x, i; int x, i;
int y; int y;

4
qw_client/gl_screen.c
View File

@ -559,14 +559,14 @@ void SCR_SetUpToDrawConsole (void)
if (scr_conlines < scr_con_current) if (scr_conlines < scr_con_current)
{ {
scr_con_current -= scr_conspeed.value*host_frametime; scr_con_current -= scr_conspeed.value*host_frametime*4;
if (scr_conlines > scr_con_current) if (scr_conlines > scr_con_current)
scr_con_current = scr_conlines; scr_con_current = scr_conlines;
} }
else if (scr_conlines > scr_con_current) else if (scr_conlines > scr_con_current)
{ {
scr_con_current += scr_conspeed.value*host_frametime; scr_con_current += scr_conspeed.value*host_frametime*4;
if (scr_conlines < scr_con_current) if (scr_conlines < scr_con_current)
scr_con_current = scr_conlines; scr_con_current = scr_conlines;
} }

1337
qw_client/sbar.c Normal file
View File

File diff suppressed because it is too large Load Diff

4
qw_client/screen.c
View File

@ -528,14 +528,14 @@ void SCR_SetUpToDrawConsole (void)
if (scr_conlines < scr_con_current) if (scr_conlines < scr_con_current)
{ {
scr_con_current -= scr_conspeed.value*host_frametime; scr_con_current -= scr_conspeed.value*host_frametime*4;
if (scr_conlines > scr_con_current) if (scr_conlines > scr_con_current)
scr_con_current = scr_conlines; scr_con_current = scr_conlines;
} }
else if (scr_conlines > scr_con_current) else if (scr_conlines > scr_con_current)
{ {
scr_con_current += scr_conspeed.value*host_frametime; scr_con_current += scr_conspeed.value*host_frametime*4;
if (scr_conlines < scr_con_current) if (scr_conlines < scr_con_current)
scr_con_current = scr_conlines; scr_con_current = scr_conlines;
} }

4
uquake/gl_screen.c
View File

@ -565,14 +565,14 @@ void SCR_SetUpToDrawConsole (void)
if (scr_conlines < scr_con_current) if (scr_conlines < scr_con_current)
{ {
scr_con_current -= scr_conspeed.value*host_frametime; scr_con_current -= scr_conspeed.value*host_frametime*4;
if (scr_conlines > scr_con_current) if (scr_conlines > scr_con_current)
scr_con_current = scr_conlines; scr_con_current = scr_conlines;
} }
else if (scr_conlines > scr_con_current) else if (scr_conlines > scr_con_current)
{ {
scr_con_current += scr_conspeed.value*host_frametime; scr_con_current += scr_conspeed.value*host_frametime*4;
if (scr_conlines < scr_con_current) if (scr_conlines < scr_con_current)
scr_con_current = scr_conlines; scr_con_current = scr_conlines;
} }

4
uquake/sbar.c
View File

@ -847,7 +847,11 @@ void Sbar_DrawFace (void)
if (cl.stats[STAT_HEALTH] >= 100) if (cl.stats[STAT_HEALTH] >= 100)
f = 4; f = 4;
else else
{
f = cl.stats[STAT_HEALTH] / 20; f = cl.stats[STAT_HEALTH] / 20;
if (f < 0)
f = 0;
}
if (cl.time <= cl.faceanimtime) if (cl.time <= cl.faceanimtime)
{ {

4
uquake/screen.c
View File

@ -556,14 +556,14 @@ void SCR_SetUpToDrawConsole (void)
if (scr_conlines < scr_con_current) if (scr_conlines < scr_con_current)
{ {
scr_con_current -= scr_conspeed.value*host_frametime; scr_con_current -= scr_conspeed.value*host_frametime*4;
if (scr_conlines > scr_con_current) if (scr_conlines > scr_con_current)
scr_con_current = scr_conlines; scr_con_current = scr_conlines;
} }
else if (scr_conlines > scr_con_current) else if (scr_conlines > scr_con_current)
{ {
scr_con_current += scr_conspeed.value*host_frametime; scr_con_current += scr_conspeed.value*host_frametime*4;
if (scr_conlines < scr_con_current) if (scr_conlines < scr_con_current)
scr_con_current = scr_conlines; scr_con_current = scr_conlines;
} }