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

gl_draw.c is now client clean.

Browse source
This commit is contained in:
Bill Currie 2001-05-23 04:05:10 +00:00
parent f49608b881
commit ec7335029d
7 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/QF/render.h
View file

@ -190,6 +190,7 @@ extern qboolean r_paused;
extern entity_t *r_view_model;
extern entity_t *r_player_entity;
extern int r_lineadj;
extern qboolean r_active;
void *D_SurfaceCacheAddress (void);
int D_SurfaceCacheForRes (int width, int height);

4
nq/source/gl_draw.c
View file

@ -42,12 +42,12 @@
#include "QF/console.h"
#include "QF/draw.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/vid.h"
#include "QF/va.h"
#include "client.h"
#include "glquake.h"
#include "r_cvar.h"
#include "sbar.h"
@ -559,7 +559,7 @@ Draw_ConsoleBackground (int lines)
ofs = (vid.conheight - lines) / (float) vid.conheight;
y = vid.height * scr_consize->value;
if (cls.state != ca_active || lines > y) {
if (!r_active || lines > y) {
alpha = 1.0;
} else {
// set up to draw alpha console

1
nq/source/host.c
View file

@ -710,6 +710,7 @@ _Host_Frame (float time)
|| cl.stats[STAT_HEALTH] <= 0);
r_force_fullscreen = cl.intermission;
r_paused = cl.paused;
r_active = cls.state == ca_active;
r_view_model = &cl.viewent;
SCR_UpdateScreen (cl.time);

1
nq/source/r_main.c
View file

@ -12,6 +12,7 @@ entity_t *r_view_model;
entity_t *r_player_entity;
lightstyle_t r_lightstyle[MAX_LIGHTSTYLES];
int r_lineadj;
qboolean r_active;
float r_time1;

1
qw/source/cl_main.c
View file

@ -1485,6 +1485,7 @@ Host_Frame (float time)
|| cl.stats[STAT_HEALTH] <= 0);
r_force_fullscreen = cl.intermission;
r_paused = cl.paused;
r_active = cls.state == ca_active;
r_view_model = &cl.viewent;
// don't allow cheats in multiplayer

4
qw/source/gl_draw.c
View file

@ -42,12 +42,12 @@
#include "QF/console.h"
#include "QF/draw.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/vid.h"
#include "QF/va.h"
#include "client.h"
#include "glquake.h"
#include "r_cvar.h"
#include "sbar.h"
@ -559,7 +559,7 @@ Draw_ConsoleBackground (int lines)
ofs = (vid.conheight - lines) / (float) vid.conheight;
y = vid.height * scr_consize->value;
if (cls.state != ca_active || lines > y) {
if (!r_active || lines > y) {
alpha = 1.0;
} else {
// set up to draw alpha console

1
qw/source/r_main.c
View file

@ -12,6 +12,7 @@ entity_t *r_view_model;
entity_t *r_player_entity;
lightstyle_t r_lightstyle[MAX_LIGHTSTYLES];
int r_lineadj;
qboolean r_active;
float r_time1;