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

gl_screen.c and screen.c are now client clean (and merged :)

Browse source
This commit is contained in:
Bill Currie 2001-05-23 06:33:23 +00:00
parent ec7335029d
commit 1a25bc9349
29 changed files with 687 additions and 759 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/draw.h
View file

@ -42,7 +42,7 @@ void Draw_TextBox (int x, int y, int width, int lines);
void Draw_TransPic (int x, int y, qpic_t *pic);
void Draw_TransPicTranslate (int x, int y, qpic_t *pic, byte *translation);
void Draw_ConsoleBackground (int lines);
void Draw_Crosshair(void);
void Draw_Crosshair(int swap);
void Draw_BeginDisc (void);
void Draw_EndDisc (void);
void Draw_TileClear (int x, int y, int w, int h);

19
include/QF/screen.h
View file

@ -36,7 +36,9 @@
void SCR_Init_Cvars (void);
void SCR_Init (void);
void SCR_UpdateScreen (double realtime);
typedef void (*SCR_Func)(int);
// scr_funcs is a null terminated array
void SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs, int swap);
void SCR_UpdateWholeScreen (void);
void SCR_SizeUp (void);
@ -47,6 +49,17 @@ void SCR_CenterPrint (char *str);
void SCR_BeginLoadingPlaque (void);
void SCR_EndLoadingPlaque (void);
void SCR_DrawRam (int swap);
void SCR_DrawFPS (int swap);
void SCR_DrawTime (int swap);
void SCR_DrawTurtle (int swap);
void SCR_DrawPause (int swap);
void SCR_CheckDrawCenterString (int swap);
void SCR_DrawConsole (int swap);
struct tex_s *SCR_ScreenShot (int width, int height);
void SCR_DrawStringToSnap (const char *s, struct tex_s *tex, int x, int y);
int MipColor (int r, int g, int b);
int SCR_ModalMessage (char *text);
extern float scr_con_current;
@ -70,4 +83,8 @@ extern int scr_copyeverything;
extern qboolean block_drawing;
extern struct qpic_s *scr_ram;
extern struct qpic_s *scr_net;
extern struct qpic_s *scr_turtle;
#endif // __screen_h

2
include/QF/wad.h
View file

@ -49,7 +49,7 @@
#define TYP_SOUND 67
#define TYP_MIPTEX 68
typedef struct
typedef struct qpic_s
{
int width, height;
byte data[4]; // variably sized

2
include/sbar.h
View file

@ -41,7 +41,7 @@ void Sbar_Init (void);
void Sbar_Changed (void);
// call whenever any of the client stats represented on the sbar changes
void Sbar_Draw (void);
void Sbar_Draw (int swap);
// called every frame by screen
void Sbar_IntermissionOverlay (void);

2
nq/include/client.h
View file

@ -360,4 +360,6 @@ extern double realtime;
void Cvar_Info (struct cvar_s *var);
void CL_UpdateScreen (double realtime);
#endif // __client_h

4
nq/source/Makefile.am
View file

@ -72,8 +72,8 @@ qf_client_LIBS= $(top_builddir)/libs/video/targets/libQFjs.la \
client_LIBS= -L. -lqfnet $(qf_client_LIBS) $(NET_LIBS)
client_LIB_DEPS= libqfnet.a $(qf_client_LIBS)
client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
cl_tent.c \
client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_screen.c \
cl_parse.c cl_tent.c \
console.c keys.c sbar.c r_cvar.c r_efrag.c r_ent.c r_graph.c r_main.c \
r_part.c r_view.c nonintel.c locs.c pcx.c tga.c

10
nq/source/cl_main.c
View file

@ -91,6 +91,14 @@ entity_t cl_static_entities[MAX_STATIC_ENTITIES];
entity_state_t cl_static_entity_baselines[MAX_STATIC_ENTITIES];
void
CL_Sbar_f (cvar_t *var)
{
vid.recalc_refdef = true;
r_lineadj = var->int_val ? sb_lines : 0;
}
void
CL_InitCvars (void)
{
@ -130,7 +138,7 @@ CL_InitCvars (void)
"show network packets. 0=off, 1=basic, 2=verbose");
cl_nolerp = Cvar_Get ("cl_nolerp", "0", CVAR_NONE, NULL,
"linear motion interpolation");
cl_sbar = Cvar_Get ("cl_sbar", "0", CVAR_ARCHIVE, NULL,
cl_sbar = Cvar_Get ("cl_sbar", "0", CVAR_ARCHIVE, CL_Sbar_f,
"status bar mode");
cl_hudswap = Cvar_Get ("cl_hudswap", "0", CVAR_ARCHIVE, NULL,
"new HUD on left side?");

81
nq/source/cl_screen.c Normal file
View file

@ -0,0 +1,81 @@
/*
cl_screen.c
master for refresh, status bar, console, chat, notify, etc
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <time.h>
#include "QF/console.h"
#include "QF/draw.h"
#include "QF/pcx.h"
#include "QF/screen.h"
#include "QF/texture.h"
#include "client.h"
#include "sbar.h"
void
SCR_DrawNet (int swap)
{
if (r_realtime - cl.last_received_message < 0.3)
return;
if (cls.demoplayback)
return;
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
static SCR_Func scr_funcs[] = {
Draw_Crosshair,
SCR_DrawRam,
SCR_DrawNet,
SCR_DrawFPS,
SCR_DrawTime,
SCR_DrawTurtle,
SCR_DrawPause,
SCR_CheckDrawCenterString,
Sbar_Draw,
SCR_DrawConsole,
// FIXME: MENUCODE
// M_Draw,
0
};
void
CL_UpdateScreen (double realtime)
{
SCR_UpdateScreen (realtime, scr_funcs, cl_hudswap->int_val);
}

2
nq/source/draw.c
View file

@ -327,7 +327,7 @@ Draw_Pixel (int x, int y, byte color)
void
Draw_Crosshair (void)
Draw_Crosshair (int swap)
{
int x, y;
extern cvar_t *crosshair, *cl_crossx, *cl_crossy, *crosshaircolor;

2
nq/source/gl_draw.c
View file

@ -359,7 +359,7 @@ Draw_AltString8 (int x, int y, char *str)
void
Draw_Crosshair (void)
Draw_Crosshair (int swap)
{
int x, y;
extern vrect_t scr_vrect;

282
nq/source/gl_screen.c
View file

@ -46,14 +46,15 @@
#include "QF/pcx.h"
#include "QF/quakefs.h" // MAX_OSPATH
#include "QF/render.h" // r_refdef
#include "QF/skin.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/tga.h"
#include "client.h"
#include "glquake.h"
#include "host.h"
#include "r_cvar.h"
#include "r_local.h"
#include "sbar.h"
#include "view.h"
@ -141,7 +142,6 @@ float scr_disabled_time;
qboolean block_drawing;
void SCR_ScreenShot_f (void);
void SCR_RSShot_f (void);
/*
CENTER PRINTING
@ -188,7 +188,7 @@ SCR_DrawCenterString (void)
int remaining;
// the finale prints the characters one at a time
if (cl.intermission)
if (r_force_fullscreen /*FIXME better test*/)
remaining = scr_printspeed->value * (r_realtime - scr_centertime_start);
else
remaining = 9999;
@ -226,7 +226,7 @@ SCR_DrawCenterString (void)
void
SCR_CheckDrawCenterString (void)
SCR_CheckDrawCenterString (int swap)
{
scr_copytop = 1;
if (scr_center_lines > scr_erase_lines)
@ -234,7 +234,7 @@ SCR_CheckDrawCenterString (void)
scr_centertime_off -= host_frametime;
if (scr_centertime_off <= 0 && !cl.intermission)
if (scr_centertime_off <= 0 && !r_force_fullscreen /*FIXME better test*/)
return;
if (key_dest != key_game)
return;
@ -301,17 +301,14 @@ SCR_CalcRefdef (void)
size = scr_viewsize->int_val;
}
// intermission is always full screen
if (cl.intermission) {
if (r_force_fullscreen /*FIXME better test*/) {
full = true;
size = 100.0;
sb_lines = 0;
}
size /= 100.0;
if (!cl_sbar->int_val && full)
h = vid.height;
else
h = vid.height - sb_lines;
h = vid.height - r_lineadj;
r_refdef.vrect.width = vid.width * size + 0.5;
if (r_refdef.vrect.width < 96) {
@ -320,11 +317,8 @@ SCR_CalcRefdef (void)
}
r_refdef.vrect.height = vid.height * size + 0.5;
if (cl_sbar->int_val || !full) {
if (r_refdef.vrect.height > vid.height - sb_lines)
r_refdef.vrect.height = vid.height - sb_lines;
} else if (r_refdef.vrect.height > vid.height)
r_refdef.vrect.height = vid.height;
if (r_refdef.vrect.height > vid.height - r_lineadj)
r_refdef.vrect.height = vid.height - r_lineadj;
r_refdef.vrect.x = (vid.width - r_refdef.vrect.width) / 2;
if (full)
r_refdef.vrect.y = 0;
@ -374,7 +368,6 @@ SCR_Init (void)
// register our commands
//
Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "Take a screenshot, saves as qfxxx.tga in the current directory");
Cmd_AddCommand ("snap", SCR_RSShot_f, "Send a screenshot to someone");
Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "Increases the screen size");
Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "Decreases the screen size");
@ -387,7 +380,7 @@ SCR_Init (void)
void
SCR_DrawRam (void)
SCR_DrawRam (int swap)
{
if (!scr_showram->int_val)
return;
@ -400,7 +393,7 @@ SCR_DrawRam (void)
void
SCR_DrawTurtle (void)
SCR_DrawTurtle (int swap)
{
static int count;
@ -420,25 +413,11 @@ SCR_DrawTurtle (void)
}
void
SCR_DrawNet (void)
{
// if (cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged <
// UPDATE_BACKUP - 1)
if (r_realtime - cl.last_received_message < 0.3)
return;
if (cls.demoplayback)
return;
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
extern cvar_t *show_time;
extern cvar_t *show_fps;
void
SCR_DrawFPS (void)
SCR_DrawFPS (int swap)
{
static double lastframetime;
double t;
@ -468,7 +447,7 @@ SCR_DrawFPS (void)
i = 80;
}
x = cl_hudswap->int_val ? vid.width - ((strlen (st) * 8) + i) : i;
x = swap ? vid.width - ((strlen (st) * 8) + i) : i;
y = vid.height - sb_lines - 8;
Draw_String8 (x, y, st);
}
@ -481,7 +460,7 @@ SCR_DrawFPS (void)
Written by Misty, rewritten by Deek.
*/
void
SCR_DrawTime (void)
SCR_DrawTime (int swap)
{
int x, y;
char st[80];
@ -506,21 +485,21 @@ SCR_DrawTime (void)
strftime (st, sizeof (st), timefmt, local);
// Print it at far left/right of screen
x = cl_hudswap->int_val ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
x = swap ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
y = vid.height - (sb_lines + 8);
Draw_String8 (x, y, st);
}
void
SCR_DrawPause (void)
SCR_DrawPause (int swap)
{
qpic_t *pic;
if (!scr_showpause->int_val) // turn off for screenshots
return;
if (!cl.paused)
if (r_paused)
return;
pic = Draw_CachePic ("gfx/pause.lmp", true);
@ -535,7 +514,7 @@ SCR_SetUpToDrawConsole (void)
Con_CheckResize ();
// decide on the height of the console
if (cls.state != ca_active) {
if (!r_active) {
scr_conlines = vid.height; // full screen
scr_con_current = scr_conlines;
} else if (key_dest == key_console)
@ -563,7 +542,7 @@ SCR_SetUpToDrawConsole (void)
void
SCR_DrawConsole (void)
SCR_DrawConsole (int swap)
{
if (scr_con_current) {
scr_copyeverything = 1;
@ -581,6 +560,78 @@ SCR_DrawConsole (void)
SCREEN SHOTS
*/
tex_t *
SCR_ScreenShot (int width, int height)
{
int x, y;
unsigned char *src, *dest;
int w, h;
int dx, dy, dex, dey, nx;
int r, b, g;
int count;
float fracw, frach;
tex_t *tex;
tex = Hunk_TempAlloc (sizeof (tex_t) + vid.width * vid.height * 3);
if (!tex)
return 0;
glReadPixels (glx, gly, vid.width, vid.height, GL_RGB, GL_UNSIGNED_BYTE,
tex->data + vid.width * vid.height);
w = (vid.width < width) ? vid.width : width;
h = (vid.height < height) ? vid.height : height;
fracw = (float) vid.width / (float) w;
frach = (float) vid.height / (float) h;
for (y = 0; y < h; y++) {
dest = tex->data + (w * 3 * y);
for (x = 0; x < w; x++) {
r = g = b = 0;
dx = x * fracw;
dex = (x + 1) * fracw;
if (dex == dx)
dex++; // at least one
dy = y * frach;
dey = (y + 1) * frach;
if (dey == dy)
dey++; // at least one
count = 0;
for ( /* */ ; dy < dey; dy++) {
src = tex->data + (vid.width * 3 * dy) + dx * 3;
for (nx = dx; nx < dex; nx++) {
r += *src++;
g += *src++;
b += *src++;
count++;
}
}
r /= count;
g /= count;
b /= count;
*dest++ = r;
*dest++ = b;
*dest++ = g;
}
}
// convert to eight bit
for (y = 0; y < h; y++) {
src = tex->data + (w * 3 * y);
dest = tex->data + (w * y);
for (x = 0; x < w; x++) {
*dest++ = MipColor (src[0], src[1], src[2]);
src += 3;
}
}
return tex;
}
void
SCR_ScreenShot_f (void)
@ -672,10 +723,12 @@ SCR_DrawCharToSnap (int num, byte * dest, int width)
void
SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
SCR_DrawStringToSnap (const char *s, tex_t *tex, int x, int y)
{
byte *buf = tex->data;
byte *dest;
const unsigned char *p;
int width = tex->width;
dest = buf + ((y * width) + x);
@ -687,117 +740,6 @@ SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
}
void
SCR_RSShot_f (void)
{
#if 0
int x, y;
unsigned char *src, *dest;
char pcxname[80];
pcx_t *pcx;
int pcx_len;
unsigned char *newbuf;
int w, h;
int dx, dy, dex, dey, nx;
int r, b, g;
int count;
float fracw, frach;
char st[80];
time_t now;
if (CL_IsUploading ())
return; // already one pending
if (cls.state < ca_onserver)
return; // gotta be connected
Con_Printf ("Remote screen shot requested.\n");
snprintf (pcxname, sizeof (pcxname), "rss.pcx");
//
// save the pcx file
//
newbuf = malloc (glheight * glwidth * 3);
glReadPixels (glx, gly, glwidth, glheight, GL_RGB, GL_UNSIGNED_BYTE,
newbuf);
w = (vid.width < RSSHOT_WIDTH) ? glwidth : RSSHOT_WIDTH;
h = (vid.height < RSSHOT_HEIGHT) ? glheight : RSSHOT_HEIGHT;
fracw = (float) glwidth / (float) w;
frach = (float) glheight / (float) h;
for (y = 0; y < h; y++) {
dest = newbuf + (w * 3 * y);
for (x = 0; x < w; x++) {
r = g = b = 0;
dx = x * fracw;
dex = (x + 1) * fracw;
if (dex == dx)
dex++; // at least one
dy = y * frach;
dey = (y + 1) * frach;
if (dey == dy)
dey++; // at least one
count = 0;
for ( /* */ ; dy < dey; dy++) {
src = newbuf + (glwidth * 3 * dy) + dx * 3;
for (nx = dx; nx < dex; nx++) {
r += *src++;
g += *src++;
b += *src++;
count++;
}
}
r /= count;
g /= count;
b /= count;
*dest++ = r;
*dest++ = b;
*dest++ = g;
}
}
// convert to eight bit
for (y = 0; y < h; y++) {
src = newbuf + (w * 3 * y);
dest = newbuf + (w * y);
for (x = 0; x < w; x++) {
*dest++ = MipColor (src[0], src[1], src[2]);
src += 3;
}
}
time (&now);
strcpy (st, ctime (&now));
st[strlen (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 1, w);
strncpy (st, cls.servername, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 11, w);
strncpy (st, cl_name->string, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 21, w);
pcx = EncodePCX (newbuf, w, h, w, vid_basepal, true, &pcx_len);
CL_StartUpload ((void *)pcx, pcx_len);
free (newbuf);
Con_Printf ("Wrote %s\n", pcxname);
Con_Printf ("Sending shot to server...\n");
#endif
}
char *scr_notifystring;
void
@ -877,7 +819,7 @@ extern cvar_t *brightness;
needs almost the entire 256k of stack space!
*/
void
SCR_UpdateScreen (double realtime)
SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs, int swap)
{
double time1 = 0, time2;
float f;
@ -904,11 +846,6 @@ SCR_UpdateScreen (double realtime)
if (!scr_initialized || !con_initialized) // not initialized yet
return;
if (oldsbar != cl_sbar->int_val) {
oldsbar = cl_sbar->int_val;
vid.recalc_refdef = true;
}
if (oldviewsize != scr_viewsize->int_val) {
oldviewsize = scr_viewsize->int_val;
vid.recalc_refdef = true;
@ -941,29 +878,16 @@ SCR_UpdateScreen (double realtime)
// draw any areas not covered by the refresh
SCR_TileClear ();
//if (r_netgraph->int_val)
// CL_NetGraph ();
if (cl.intermission == 1 && key_dest == key_game) {
if (r_force_fullscreen /*FIXME better test*/ == 1 && key_dest == key_game) {
Sbar_IntermissionOverlay ();
} else if (cl.intermission == 2 && key_dest == key_game) {
} else if (r_force_fullscreen /*FIXME better test*/ == 2 && key_dest == key_game) {
Sbar_FinaleOverlay ();
SCR_CheckDrawCenterString ();
SCR_CheckDrawCenterString (swap);
} else {
if (crosshair->int_val)
Draw_Crosshair ();
SCR_DrawRam ();
SCR_DrawNet ();
SCR_DrawFPS ();
SCR_DrawTime ();
SCR_DrawTurtle ();
SCR_DrawPause ();
SCR_CheckDrawCenterString ();
Sbar_Draw ();
SCR_DrawConsole ();
// FIXME: MENUCODE
// M_Draw ();
while (*scr_funcs) {
(*scr_funcs)(swap);
scr_funcs++;
}
}
// LordHavoc: adjustable brightness and contrast,

4
nq/source/host.c
View file

@ -713,7 +713,7 @@ _Host_Frame (float time)
r_active = cls.state == ca_active;
r_view_model = &cl.viewent;
SCR_UpdateScreen (cl.time);
CL_UpdateScreen (cl.time);
if (host_speeds->int_val)
time2 = Sys_DoubleTime ();
@ -1009,7 +1009,7 @@ Host_Init (quakeparms_t *parms)
Sys_Printf ("========Quake Initialized=========\n");
SCR_UpdateScreen (cl.time);
CL_UpdateScreen (cl.time);
}

2
nq/source/keys.c
View file

@ -300,7 +300,7 @@ Key_Console (int key)
key_lines[edit_line][1] = 0;
key_linepos = 1;
if (cls.state == ca_disconnected)
SCR_UpdateScreen (cl.time); // force an update, because the
CL_UpdateScreen (cl.time); // force an update, because the
// command may take some time
return;

6
nq/source/net_dgrm.c
View file

@ -1297,7 +1297,7 @@ _Datagram_Connect (char *host)
// send the connection request
Con_Printf ("trying...\n");
SCR_UpdateScreen (cl.time);
CL_UpdateScreen (cl.time);
start_time = net_time;
for (reps = 0; reps < 3; reps++) {
@ -1325,7 +1325,7 @@ _Datagram_Connect (char *host)
Con_Printf ("wrong reply address\n");
Con_Printf ("Expected: %s\n", StrAddr (&sendaddr));
Con_Printf ("Received: %s\n", StrAddr (&readaddr));
SCR_UpdateScreen (cl.time);
CL_UpdateScreen (cl.time);
#endif
ret = 0;
continue;
@ -1359,7 +1359,7 @@ _Datagram_Connect (char *host)
if (ret)
break;
Con_Printf ("still trying...\n");
SCR_UpdateScreen (cl.time);
CL_UpdateScreen (cl.time);
start_time = SetNetTime ();
}

2
nq/source/sbar.c
View file

@ -843,7 +843,7 @@ Sbar_DrawNormal (void)
void
Sbar_Draw (void)
Sbar_Draw (int swap)
{
// FIXME: MISSIONHUD
// if (hipnotic || rogue) {

285
nq/source/screen.c
View file

@ -44,14 +44,17 @@
#include "QF/draw.h"
#include "QF/keys.h"
#include "QF/pcx.h"
#include "QF/skin.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/vid.h"
#include "client.h"
#include "d_iface.h"
#include "host.h"
#include "r_cvar.h"
#include "r_local.h"
#include "sbar.h"
#include "view.h"
@ -137,7 +140,6 @@ qboolean scr_skipupdate;
qboolean block_drawing;
void SCR_ScreenShot_f (void);
void SCR_RSShot_f (void);
/*
CENTER PRINTING
@ -162,7 +164,7 @@ SCR_CenterPrint (char *str)
{
strncpy (scr_centerstring, str, sizeof (scr_centerstring) - 1);
scr_centertime_off = scr_centertime->value;
scr_centertime_start = cl.time;
scr_centertime_start = r_realtime;
// count the number of lines for centering
scr_center_lines = 1;
@ -184,8 +186,8 @@ SCR_DrawCenterString (void)
int remaining;
// the finale prints the characters one at a time
if (cl.intermission)
remaining = scr_printspeed->value * (cl.time - scr_centertime_start);
if (r_force_fullscreen /*FIXME*/)
remaining = scr_printspeed->value * (r_realtime - scr_centertime_start);
else
remaining = 9999;
@ -222,7 +224,7 @@ SCR_DrawCenterString (void)
void
SCR_CheckDrawCenterString (void)
SCR_CheckDrawCenterString (int swap)
{
scr_copytop = 1;
if (scr_center_lines > scr_erase_lines)
@ -230,7 +232,7 @@ SCR_CheckDrawCenterString (void)
scr_centertime_off -= host_frametime;
if (scr_centertime_off <= 0 && !cl.intermission)
if (scr_centertime_off <= 0 && !r_force_fullscreen /*FIXME*/)
return;
if (key_dest != key_game)
return;
@ -303,17 +305,14 @@ SCR_CalcRefdef (void)
size = scr_viewsize->int_val;
}
// intermission is always full screen
if (cl.intermission) {
if (r_force_fullscreen /*FIXME*/) {
full = true;
size = 100.0;
sb_lines = 0;
}
size /= 100.0;
if (!cl_sbar->int_val && full)
h = vid.height;
else
h = vid.height - sb_lines;
h = vid.height - r_lineadj;
r_refdef.vrect.width = vid.width * size + 0.5;
if (r_refdef.vrect.width < 96) {
@ -322,11 +321,8 @@ SCR_CalcRefdef (void)
}
r_refdef.vrect.height = vid.height * size + 0.5;
if (cl_sbar->int_val || !full) {
if (r_refdef.vrect.height > vid.height - sb_lines)
r_refdef.vrect.height = vid.height - sb_lines;
} else if (r_refdef.vrect.height > vid.height)
r_refdef.vrect.height = vid.height;
if (r_refdef.vrect.height > vid.height - r_lineadj)
r_refdef.vrect.height = vid.height - r_lineadj;
r_refdef.vrect.x = (vid.width - r_refdef.vrect.width) / 2;
if (full)
r_refdef.vrect.y = 0;
@ -346,7 +342,7 @@ SCR_CalcRefdef (void)
vrect.width = vid.width;
vrect.height = vid.height;
R_SetVrect (&vrect, &scr_vrect, cl_sbar->int_val ? sb_lines : 0);
R_SetVrect (&vrect, &scr_vrect, r_lineadj);
// guard against going from one mode to another that's less than half the
// vertical resolution
@ -354,7 +350,7 @@ SCR_CalcRefdef (void)
scr_con_current = vid.height;
// notify the refresh of the change
R_ViewChanged (&vrect, cl_sbar->int_val ? sb_lines : 0, vid.aspect);
R_ViewChanged (&vrect, r_lineadj, vid.aspect);
}
@ -396,7 +392,6 @@ SCR_Init (void)
// register our commands
//
Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "Take a screenshot and write it as qfxxx.tga in the current directory");
Cmd_AddCommand ("snap", SCR_RSShot_f, "Take a screenshot and upload it to the server");
Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "Increase the size of the screen");
Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "Decrease the size of the screen");
@ -409,7 +404,7 @@ SCR_Init (void)
void
SCR_DrawRam (void)
SCR_DrawRam (int swap)
{
if (!scr_showram->int_val)
return;
@ -422,7 +417,7 @@ SCR_DrawRam (void)
void
SCR_DrawTurtle (void)
SCR_DrawTurtle (int swap)
{
static int count;
@ -442,25 +437,11 @@ SCR_DrawTurtle (void)
}
void
SCR_DrawNet (void)
{
// if (cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged <
// UPDATE_BACKUP - 1)
if (r_realtime - cl.last_received_message < 0.3)
return;
if (cls.demoplayback)
return;
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
extern cvar_t *show_fps;
extern cvar_t *show_time;
void
SCR_DrawFPS (void)
SCR_DrawFPS (int swap)
{
static double lastframetime;
double t;
@ -489,7 +470,7 @@ SCR_DrawFPS (void)
} else {
i = 80;
}
x = cl_hudswap->int_val ? vid.width - ((strlen (st) * 8) + i) : i;
x = swap ? vid.width - ((strlen (st) * 8) + i) : i;
y = vid.height - (sb_lines + 8);
Draw_String8 (x, y, st);
}
@ -502,7 +483,7 @@ SCR_DrawFPS (void)
Written by Misty, rewritten by Deek
*/
void
SCR_DrawTime (void)
SCR_DrawTime (int swap)
{
int x, y;
char st[80];
@ -527,21 +508,21 @@ SCR_DrawTime (void)
// Print it next to the fps meter
strftime (st, sizeof (st), timefmt, local);
x = cl_hudswap->int_val ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
x = swap ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
y = vid.height - (sb_lines + 8);
Draw_String8 (x, y, st);
}
void
SCR_DrawPause (void)
SCR_DrawPause (int swap)
{
qpic_t *pic;
if (!scr_showpause->int_val) // turn off for screenshots
return;
if (!cl.paused)
if (!r_paused)
return;
pic = Draw_CachePic ("gfx/pause.lmp", true);
@ -559,7 +540,7 @@ SCR_SetUpToDrawConsole (void)
Con_CheckResize ();
// decide on the height of the console
if (cls.state != ca_active) {
if (!r_active) {
scr_conlines = vid.height; // full screen
scr_con_current = scr_conlines;
} else if (key_dest == key_console)
@ -587,7 +568,7 @@ SCR_SetUpToDrawConsole (void)
void
SCR_DrawConsole (void)
SCR_DrawConsole (int swap)
{
if (scr_con_current) {
scr_copyeverything = 1;
@ -605,6 +586,68 @@ SCR_DrawConsole (void)
SCREEN SHOTS
*/
tex_t *
SCR_ScreenShot (int width, int height)
{
int x, y;
unsigned char *src, *dest;
int w, h;
int dx, dy, dex, dey, nx;
int r, b, g;
int count;
float fracw, frach;
tex_t *tex;
// enable direct drawing of console to back buffer
D_EnableBackBufferAccess ();
w = (vid.width < width) ? vid.width : width;
h = (vid.height < height) ? vid.height : height;
fracw = (float) vid.width / (float) w;
frach = (float) vid.height / (float) h;
tex = Hunk_TempAlloc (sizeof (tex_t) + w * h);
if (!tex)
return 0;
for (y = 0; y < h; y++) {
dest = tex->data + (w * y);
for (x = 0; x < w; x++) {
r = g = b = 0;
dx = x * fracw;
dex = (x + 1) * fracw;
if (dex == dx)
dex++; // at least one
dy = y * frach;
dey = (y + 1) * frach;
if (dey == dy)
dey++; // at least one
count = 0;
for ( /* */ ; dy < dey; dy++) {
src = vid.buffer + (vid.rowbytes * dy) + dx;
for (nx = dx; nx < dex; nx++) {
r += vid_basepal[*src * 3];
g += vid_basepal[*src * 3 + 1];
b += vid_basepal[*src * 3 + 2];
src++;
count++;
}
}
r /= count;
g /= count;
b /= count;
*dest++ = MipColor (r, g, b);
}
}
// for adapters that can't stay mapped in for linear writes all the time
D_DisableBackBufferAccess ();
return tex;
}
void
SCR_ScreenShot_f (void)
@ -703,10 +746,12 @@ SCR_DrawCharToSnap (int num, byte * dest, int width)
void
SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
SCR_DrawStringToSnap (const char *s, tex_t *tex, int x, int y)
{
byte *buf = tex->data;
byte *dest;
const unsigned char *p;
int width = tex->width;
dest = buf + ((y * width) + x);
@ -718,111 +763,6 @@ SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
}
void
SCR_RSShot_f (void)
{
#if 0
int x, y;
unsigned char *src, *dest;
char pcxname[80];
pcx_t *pcx;
int pcx_len;
unsigned char *newbuf;
int w, h;
int dx, dy, dex, dey, nx;
int r, b, g;
int count;
float fracw, frach;
char st[80];
time_t now;
if (CL_IsUploading ())
return; // already one pending
if (cls.state < ca_onserver)
return; // gotta be connected
Con_Printf ("Remote screen shot requested.\n");
snprintf (pcxname, sizeof (pcxname), "rss.pcx");
//
// save the pcx file
//
D_EnableBackBufferAccess (); // enable direct drawing of console
// to back
// buffer
w = (vid.width < RSSHOT_WIDTH) ? vid.width : RSSHOT_WIDTH;
h = (vid.height < RSSHOT_HEIGHT) ? vid.height : RSSHOT_HEIGHT;
fracw = (float) vid.width / (float) w;
frach = (float) vid.height / (float) h;
newbuf = calloc (1, w * h);
for (y = 0; y < h; y++) {
dest = newbuf + (w * y);
for (x = 0; x < w; x++) {
r = g = b = 0;
dx = x * fracw;
dex = (x + 1) * fracw;
if (dex == dx)
dex++; // at least one
dy = y * frach;
dey = (y + 1) * frach;
if (dey == dy)
dey++; // at least one
count = 0;
for ( /* */ ; dy < dey; dy++) {
src = vid.buffer + (vid.rowbytes * dy) + dx;
for (nx = dx; nx < dex; nx++) {
r += vid_basepal[*src * 3];
g += vid_basepal[*src * 3 + 1];
b += vid_basepal[*src * 3 + 2];
src++;
count++;
}
}
r /= count;
g /= count;
b /= count;
*dest++ = MipColor (r, g, b);
}
}
time (&now);
strcpy (st, ctime (&now));
st[strlen (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 0, w);
strncpy (st, cls.servername, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 10, w);
strncpy (st, cl_name->string, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 20, w);
pcx = EncodePCX (newbuf, w, h, w, vid_basepal, false, &pcx_len);
CL_StartUpload ((void *)pcx, pcx_len);
free (newbuf);
D_DisableBackBufferAccess (); // for adapters that can't stay
// mapped in
// for linear writes all the time
Con_Printf ("Wrote %s\n", pcxname);
Con_Printf ("Sending shot to server...\n");
#endif
}
//=============================================================================
@ -874,7 +814,7 @@ SCR_DrawNotifyString (void)
needs almost the entire 256k of stack space!
*/
void
SCR_UpdateScreen (double realtime)
SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs, int swap)
{
static int oldscr_viewsize;
vrect_t vrect;
@ -919,11 +859,6 @@ SCR_UpdateScreen (double realtime)
vid.recalc_refdef = true;
}
if (oldsbar != cl_sbar->int_val) {
oldsbar = cl_sbar->int_val;
vid.recalc_refdef = true;
}
if (vid.recalc_refdef) {
// something changed, so reorder the screen
SCR_CalcRefdef ();
@ -956,30 +891,16 @@ SCR_UpdateScreen (double realtime)
D_EnableBackBufferAccess (); // of all overlay stuff if drawing
// directly
if (cl.intermission == 1 && key_dest == key_game) {
if (r_force_fullscreen /*FIXME*/ == 1 && key_dest == key_game) {
Sbar_IntermissionOverlay ();
} else if (cl.intermission == 2 && key_dest == key_game) {
} else if (r_force_fullscreen /*FIXME*/ == 2 && key_dest == key_game) {
Sbar_FinaleOverlay ();
SCR_CheckDrawCenterString ();
SCR_CheckDrawCenterString (swap);
} else {
if (crosshair->int_val)
Draw_Crosshair ();
SCR_DrawRam ();
SCR_DrawNet ();
//if (r_netgraph->int_val)
// CL_NetGraph ();
SCR_DrawFPS ();
SCR_DrawTime ();
SCR_DrawTurtle ();
SCR_DrawPause ();
SCR_CheckDrawCenterString ();
Sbar_Draw ();
SCR_DrawConsole ();
// FIXME: MENUCODE
// M_Draw ();
while (*scr_funcs) {
(*scr_funcs)(swap);
scr_funcs++;
}
}
@ -1021,11 +942,3 @@ SCR_UpdateScreen (double realtime)
VID_Update (&vrect);
}
}
void
SCR_UpdateWholeScreen (double realtime)
{
scr_fullupdate = 0;
SCR_UpdateScreen (realtime);
}

6
qw/include/client.h
View file

@ -318,6 +318,10 @@ extern double realtime;
void Cvar_Info (struct cvar_s *var);
void CL_NetGraph (void);
void CL_NetGraph (int swap);
void CL_UpdateScreen (double realtime);
#define RSSHOT_WIDTH 320
#define RSSHOT_HEIGHT 200
#endif // _CLIENT_H

4
qw/source/Makefile.am
View file

@ -95,8 +95,8 @@ client_LIB_DEPS= libqfnet.a $(qf_client_LIBS)
# libQFjs is seperate because it needs to be linked after when building statically
client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
cl_main.c cl_misc.c cl_ngraph.c cl_parse.c cl_pred.c cl_skin.c \
cl_slist.c cl_tent.c \
cl_main.c cl_misc.c cl_ngraph.c cl_parse.c cl_screen.c cl_pred.c \
cl_skin.c cl_slist.c cl_tent.c \
console.c keys.c locs.c nonintel.c pcx.c r_cvar.c r_efrag.c \
r_ent.c r_graph.c r_main.c r_view.c sbar.c skin.c teamplay.c tga.c \
wad.c cl_math.S $(syscl_SRC)

15
qw/source/cl_main.c
View file

@ -203,6 +203,14 @@ char soundlist_name[] = "soundlist %i %i";
cvar_t *confirm_quit;
void CL_RSShot_f (void);
void
CL_Sbar_f (cvar_t *var)
{
vid.recalc_refdef = true;
r_lineadj = var->int_val ? sb_lines : 0;
}
void
CL_Quit_f (void)
@ -1136,6 +1144,7 @@ CL_Init (void)
"server'");
Cmd_AddCommand ("rerecord", CL_ReRecord_f, "Rerecord a demo on the same "
"server");
Cmd_AddCommand ("snap", CL_RSShot_f, "Take a screenshot and upload it to the server");
Cmd_AddCommand ("stop", CL_Stop_f, "Stop recording a demo");
Cmd_AddCommand ("playdemo", CL_PlayDemo_f, "Play a recorded demo");
Cmd_AddCommand ("timedemo", CL_TimeDemo_f, "Play a demo as fast as your "
@ -1228,7 +1237,7 @@ CL_Init_Cvars (void)
"write config files?");
cl_shownet = Cvar_Get ("cl_shownet", "0", CVAR_NONE, NULL,
"show network packets. 0=off, 1=basic, 2=verbose");
cl_sbar = Cvar_Get ("cl_sbar", "0", CVAR_ARCHIVE, NULL, "status bar mode");
cl_sbar = Cvar_Get ("cl_sbar", "0", CVAR_ARCHIVE, CL_Sbar_f, "status bar mode");
cl_sbar_separator = Cvar_Get ("cl_sbar_separator", "0", CVAR_ARCHIVE, NULL,
"turns on status bar separator");
cl_hudswap = Cvar_Get ("cl_hudswap", "0", CVAR_ARCHIVE, NULL,
@ -1492,7 +1501,7 @@ Host_Frame (float time)
if (!atoi (Info_ValueForKey (cl.serverinfo, "watervis")))
Cvar_SetValue (r_wateralpha, 1);
SCR_UpdateScreen (realtime);
CL_UpdateScreen (realtime);
if (host_speeds->int_val)
time2 = Sys_DoubleTime ();
@ -1687,7 +1696,7 @@ Host_Init (void)
Con_Printf ("€<EFBFBD><EFBFBD>‚ %s initialized €<><E282AC>‚\n", PROGRAM);
SCR_UpdateScreen (realtime);
CL_UpdateScreen (realtime);
}

12
qw/source/cl_ngraph.c
View file

@ -36,18 +36,22 @@
#include "cl_parse.h"
#include "client.h"
#include "r_cvar.h" //XXX
#include "sbar.h"
void
CL_NetGraph (void)
CL_NetGraph (int swap)
{
int a, l, x, y, h, i;
int lost;
char st[80];
if (!r_netgraph->int_val)
return;
a = 0; // shut up gcc
x = cl_hudswap->int_val ? vid.width - (NET_TIMINGS + 16): 0;
x = swap ? vid.width - (NET_TIMINGS + 16): 0;
y = vid.height - sb_lines - 24 - r_graphheight->int_val - 1;
h = r_graphheight->int_val % 8;
@ -55,7 +59,7 @@ CL_NetGraph (void)
Draw_TextBox (x, y, NET_TIMINGS / 8, r_graphheight->int_val / 8 + 1);
lost = CL_CalcNet ();
x = cl_hudswap->int_val ? vid.width - (NET_TIMINGS + 8) : 8;
x = swap ? vid.width - (NET_TIMINGS + 8) : 8;
y = vid.height - sb_lines - 9;
l = NET_TIMINGS;
@ -73,7 +77,7 @@ CL_NetGraph (void)
y = vid.height - sb_lines - 24 - r_graphheight->int_val + 7;
snprintf (st, sizeof (st), "%3i%% packet loss", lost);
if (cl_hudswap->int_val) {
if (swap) {
Draw_String8 (vid.width - ((strlen (st) * 8) + 8), y, st);
} else {
Draw_String8 (8, y, st);

4
qw/source/cl_parse.c
View file

@ -256,7 +256,7 @@ Model_NextDownload (void)
if (cls.downloadnumber == 0) {
Con_Printf ("Checking models...\n");
SCR_UpdateScreen (realtime);
CL_UpdateScreen (realtime);
cls.downloadnumber = 1;
}
@ -317,7 +317,7 @@ Sound_NextDownload (void)
if (cls.downloadnumber == 0) {
Con_Printf ("Checking sounds...\n");
SCR_UpdateScreen (realtime);
CL_UpdateScreen (realtime);
cls.downloadnumber = 1;
}

125
qw/source/cl_screen.c Normal file
View file

@ -0,0 +1,125 @@
/*
cl_screen.c
master for refresh, status bar, console, chat, notify, etc
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <time.h>
#include "QF/console.h"
#include "QF/draw.h"
#include "QF/pcx.h"
#include "QF/screen.h"
#include "QF/texture.h"
#include "cl_parse.h"
#include "client.h"
#include "sbar.h"
void
SCR_DrawNet (int swap)
{
if (cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged <
UPDATE_BACKUP - 1)
return;
if (cls.demoplayback)
return;
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
static SCR_Func scr_funcs[] = {
Draw_Crosshair,
SCR_DrawRam,
SCR_DrawNet,
CL_NetGraph,
SCR_DrawFPS,
SCR_DrawTime,
SCR_DrawTurtle,
SCR_DrawPause,
SCR_CheckDrawCenterString,
Sbar_Draw,
SCR_DrawConsole,
// FIXME: MENUCODE
// M_Draw,
0
};
void
CL_UpdateScreen (double realtime)
{
SCR_UpdateScreen (realtime, scr_funcs, cl_hudswap->int_val);
}
void
CL_RSShot_f (void)
{
tex_t *tex = 0;
pcx_t *pcx = 0;
char st[128];
time_t now;
int pcx_len;
if (CL_IsUploading ())
return; // already one pending
if (cls.state < ca_onserver)
return; // gotta be connected
Con_Printf ("Remote screen shot requested.\n");
tex = SCR_ScreenShot (RSSHOT_WIDTH, RSSHOT_HEIGHT);
if (tex) {
time (&now);
strcpy (st, ctime (&now));
st[strlen (st) - 1] = 0;
SCR_DrawStringToSnap (st, tex, tex->width - strlen (st) * 8, tex->height - 1);
strncpy (st, cls.servername, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, tex, tex->width - strlen (st) * 8, tex->height - 11);
strncpy (st, cl_name->string, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, tex, tex->width - strlen (st) * 8, tex->height - 21);
pcx = EncodePCX (tex->data, tex->width, tex->height, tex->width, vid_basepal, true, &pcx_len);
}
if (pcx) {
CL_StartUpload ((void *)pcx, pcx_len);
Con_Printf ("Wrote %s\n", "rss.pcx");
Con_Printf ("Sending shot to server...\n");
}
}

2
qw/source/cl_skin.c
View file

@ -64,7 +64,7 @@ Skin_NextDownload (void)
if (cls.downloadnumber == 0) {
Con_Printf ("Checking skins...\n");
SCR_UpdateScreen (realtime);
CL_UpdateScreen (realtime);
}
cls.downloadtype = dl_skin;

2
qw/source/draw.c
View file

@ -327,7 +327,7 @@ Draw_Pixel (int x, int y, byte color)
void
Draw_Crosshair (void)
Draw_Crosshair (int swap)
{
int x, y;
extern cvar_t *crosshair, *cl_crossx, *cl_crossy, *crosshaircolor;

2
qw/source/gl_draw.c
View file

@ -359,7 +359,7 @@ Draw_AltString8 (int x, int y, char *str)
void
Draw_Crosshair (void)
Draw_Crosshair (int swap)
{
int x, y;
extern vrect_t scr_vrect;

280
qw/source/gl_screen.c
View file

@ -46,15 +46,15 @@
#include "QF/pcx.h"
#include "QF/quakefs.h" // MAX_OSPATH
#include "QF/render.h" // r_refdef
#include "QF/skin.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/tga.h"
#include "cl_parse.h"
#include "client.h"
#include "glquake.h"
#include "host.h"
#include "r_cvar.h"
#include "r_local.h"
#include "sbar.h"
#include "view.h"
@ -142,7 +142,6 @@ float scr_disabled_time;
qboolean block_drawing;
void SCR_ScreenShot_f (void);
void SCR_RSShot_f (void);
/*
CENTER PRINTING
@ -189,7 +188,7 @@ SCR_DrawCenterString (void)
int remaining;
// the finale prints the characters one at a time
if (cl.intermission)
if (r_force_fullscreen /*FIXME better test*/)
remaining = scr_printspeed->value * (r_realtime - scr_centertime_start);
else
remaining = 9999;
@ -227,7 +226,7 @@ SCR_DrawCenterString (void)
void
SCR_CheckDrawCenterString (void)
SCR_CheckDrawCenterString (int swap)
{
scr_copytop = 1;
if (scr_center_lines > scr_erase_lines)
@ -235,7 +234,7 @@ SCR_CheckDrawCenterString (void)
scr_centertime_off -= host_frametime;
if (scr_centertime_off <= 0 && !cl.intermission)
if (scr_centertime_off <= 0 && !r_force_fullscreen /*FIXME better test*/)
return;
if (key_dest != key_game)
return;
@ -302,17 +301,14 @@ SCR_CalcRefdef (void)
size = scr_viewsize->int_val;
}
// intermission is always full screen
if (cl.intermission) {
if (r_force_fullscreen /*FIXME better test*/) {
full = true;
size = 100.0;
sb_lines = 0;
}
size /= 100.0;
if (!cl_sbar->int_val && full)
h = vid.height;
else
h = vid.height - sb_lines;
h = vid.height - r_lineadj;
r_refdef.vrect.width = vid.width * size + 0.5;
if (r_refdef.vrect.width < 96) {
@ -321,11 +317,8 @@ SCR_CalcRefdef (void)
}
r_refdef.vrect.height = vid.height * size + 0.5;
if (cl_sbar->int_val || !full) {
if (r_refdef.vrect.height > vid.height - sb_lines)
r_refdef.vrect.height = vid.height - sb_lines;
} else if (r_refdef.vrect.height > vid.height)
r_refdef.vrect.height = vid.height;
if (r_refdef.vrect.height > vid.height - r_lineadj)
r_refdef.vrect.height = vid.height - r_lineadj;
r_refdef.vrect.x = (vid.width - r_refdef.vrect.width) / 2;
if (full)
r_refdef.vrect.y = 0;
@ -375,7 +368,6 @@ SCR_Init (void)
// register our commands
//
Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "Take a screenshot, saves as qfxxx.tga in the current directory");
Cmd_AddCommand ("snap", SCR_RSShot_f, "Send a screenshot to someone");
Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "Increases the screen size");
Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "Decreases the screen size");
@ -388,7 +380,7 @@ SCR_Init (void)
void
SCR_DrawRam (void)
SCR_DrawRam (int swap)
{
if (!scr_showram->int_val)
return;
@ -401,7 +393,7 @@ SCR_DrawRam (void)
void
SCR_DrawTurtle (void)
SCR_DrawTurtle (int swap)
{
static int count;
@ -421,24 +413,11 @@ SCR_DrawTurtle (void)
}
void
SCR_DrawNet (void)
{
if (cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged <
UPDATE_BACKUP - 1)
return;
if (cls.demoplayback)
return;
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
extern cvar_t *show_time;
extern cvar_t *show_fps;
void
SCR_DrawFPS (void)
SCR_DrawFPS (int swap)
{
static double lastframetime;
double t;
@ -468,7 +447,7 @@ SCR_DrawFPS (void)
i = 80;
}
x = cl_hudswap->int_val ? vid.width - ((strlen (st) * 8) + i) : i;
x = swap ? vid.width - ((strlen (st) * 8) + i) : i;
y = vid.height - sb_lines - 8;
Draw_String8 (x, y, st);
}
@ -481,7 +460,7 @@ SCR_DrawFPS (void)
Written by Misty, rewritten by Deek.
*/
void
SCR_DrawTime (void)
SCR_DrawTime (int swap)
{
int x, y;
char st[80];
@ -506,21 +485,21 @@ SCR_DrawTime (void)
strftime (st, sizeof (st), timefmt, local);
// Print it at far left/right of screen
x = cl_hudswap->int_val ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
x = swap ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
y = vid.height - (sb_lines + 8);
Draw_String8 (x, y, st);
}
void
SCR_DrawPause (void)
SCR_DrawPause (int swap)
{
qpic_t *pic;
if (!scr_showpause->int_val) // turn off for screenshots
return;
if (!cl.paused)
if (r_paused)
return;
pic = Draw_CachePic ("gfx/pause.lmp", true);
@ -535,7 +514,7 @@ SCR_SetUpToDrawConsole (void)
Con_CheckResize ();
// decide on the height of the console
if (cls.state != ca_active) {
if (!r_active) {
scr_conlines = vid.height; // full screen
scr_con_current = scr_conlines;
} else if (key_dest == key_console)
@ -563,7 +542,7 @@ SCR_SetUpToDrawConsole (void)
void
SCR_DrawConsole (void)
SCR_DrawConsole (int swap)
{
if (scr_con_current) {
scr_copyeverything = 1;
@ -581,6 +560,78 @@ SCR_DrawConsole (void)
SCREEN SHOTS
*/
tex_t *
SCR_ScreenShot (int width, int height)
{
int x, y;
unsigned char *src, *dest;
int w, h;
int dx, dy, dex, dey, nx;
int r, b, g;
int count;
float fracw, frach;
tex_t *tex;
tex = Hunk_TempAlloc (sizeof (tex_t) + vid.width * vid.height * 3);
if (!tex)
return 0;
glReadPixels (glx, gly, vid.width, vid.height, GL_RGB, GL_UNSIGNED_BYTE,
tex->data + vid.width * vid.height);
w = (vid.width < width) ? vid.width : width;
h = (vid.height < height) ? vid.height : height;
fracw = (float) vid.width / (float) w;
frach = (float) vid.height / (float) h;
for (y = 0; y < h; y++) {
dest = tex->data + (w * 3 * y);
for (x = 0; x < w; x++) {
r = g = b = 0;
dx = x * fracw;
dex = (x + 1) * fracw;
if (dex == dx)
dex++; // at least one
dy = y * frach;
dey = (y + 1) * frach;
if (dey == dy)
dey++; // at least one
count = 0;
for ( /* */ ; dy < dey; dy++) {
src = tex->data + (vid.width * 3 * dy) + dx * 3;
for (nx = dx; nx < dex; nx++) {
r += *src++;
g += *src++;
b += *src++;
count++;
}
}
r /= count;
g /= count;
b /= count;
*dest++ = r;
*dest++ = b;
*dest++ = g;
}
}
// convert to eight bit
for (y = 0; y < h; y++) {
src = tex->data + (w * 3 * y);
dest = tex->data + (w * y);
for (x = 0; x < w; x++) {
*dest++ = MipColor (src[0], src[1], src[2]);
src += 3;
}
}
return tex;
}
void
SCR_ScreenShot_f (void)
@ -672,10 +723,12 @@ SCR_DrawCharToSnap (int num, byte * dest, int width)
void
SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
SCR_DrawStringToSnap (const char *s, tex_t *tex, int x, int y)
{
byte *buf = tex->data;
byte *dest;
const unsigned char *p;
int width = tex->width;
dest = buf + ((y * width) + x);
@ -687,115 +740,6 @@ SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
}
void
SCR_RSShot_f (void)
{
int x, y;
unsigned char *src, *dest;
char pcxname[80];
pcx_t *pcx;
int pcx_len;
unsigned char *newbuf;
int w, h;
int dx, dy, dex, dey, nx;
int r, b, g;
int count;
float fracw, frach;
char st[80];
time_t now;
if (CL_IsUploading ())
return; // already one pending
if (cls.state < ca_onserver)
return; // gotta be connected
Con_Printf ("Remote screen shot requested.\n");
snprintf (pcxname, sizeof (pcxname), "rss.pcx");
//
// save the pcx file
//
newbuf = malloc (glheight * glwidth * 3);
glReadPixels (glx, gly, glwidth, glheight, GL_RGB, GL_UNSIGNED_BYTE,
newbuf);
w = (vid.width < RSSHOT_WIDTH) ? glwidth : RSSHOT_WIDTH;
h = (vid.height < RSSHOT_HEIGHT) ? glheight : RSSHOT_HEIGHT;
fracw = (float) glwidth / (float) w;
frach = (float) glheight / (float) h;
for (y = 0; y < h; y++) {
dest = newbuf + (w * 3 * y);
for (x = 0; x < w; x++) {
r = g = b = 0;
dx = x * fracw;
dex = (x + 1) * fracw;
if (dex == dx)
dex++; // at least one
dy = y * frach;
dey = (y + 1) * frach;
if (dey == dy)
dey++; // at least one
count = 0;
for ( /* */ ; dy < dey; dy++) {
src = newbuf + (glwidth * 3 * dy) + dx * 3;
for (nx = dx; nx < dex; nx++) {
r += *src++;
g += *src++;
b += *src++;
count++;
}
}
r /= count;
g /= count;
b /= count;
*dest++ = r;
*dest++ = b;
*dest++ = g;
}
}
// convert to eight bit
for (y = 0; y < h; y++) {
src = newbuf + (w * 3 * y);
dest = newbuf + (w * y);
for (x = 0; x < w; x++) {
*dest++ = MipColor (src[0], src[1], src[2]);
src += 3;
}
}
time (&now);
strcpy (st, ctime (&now));
st[strlen (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 1, w);
strncpy (st, cls.servername, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 11, w);
strncpy (st, cl_name->string, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 21, w);
pcx = EncodePCX (newbuf, w, h, w, vid_basepal, true, &pcx_len);
CL_StartUpload ((void *)pcx, pcx_len);
free (newbuf);
Con_Printf ("Wrote %s\n", pcxname);
Con_Printf ("Sending shot to server...\n");
}
char *scr_notifystring;
void
@ -875,7 +819,7 @@ extern cvar_t *brightness;
needs almost the entire 256k of stack space!
*/
void
SCR_UpdateScreen (double realtime)
SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs, int swap)
{
double time1 = 0, time2;
float f;
@ -902,11 +846,6 @@ SCR_UpdateScreen (double realtime)
if (!scr_initialized || !con_initialized) // not initialized yet
return;
if (oldsbar != cl_sbar->int_val) {
oldsbar = cl_sbar->int_val;
vid.recalc_refdef = true;
}
if (oldviewsize != scr_viewsize->int_val) {
oldviewsize = scr_viewsize->int_val;
vid.recalc_refdef = true;
@ -939,29 +878,16 @@ SCR_UpdateScreen (double realtime)
// draw any areas not covered by the refresh
SCR_TileClear ();
if (r_netgraph->int_val)
CL_NetGraph ();
if (cl.intermission == 1 && key_dest == key_game) {
if (r_force_fullscreen /*FIXME better test*/ == 1 && key_dest == key_game) {
Sbar_IntermissionOverlay ();
} else if (cl.intermission == 2 && key_dest == key_game) {
} else if (r_force_fullscreen /*FIXME better test*/ == 2 && key_dest == key_game) {
Sbar_FinaleOverlay ();
SCR_CheckDrawCenterString ();
SCR_CheckDrawCenterString (swap);
} else {
if (crosshair->int_val)
Draw_Crosshair ();
SCR_DrawRam ();
SCR_DrawNet ();
SCR_DrawFPS ();
SCR_DrawTime ();
SCR_DrawTurtle ();
SCR_DrawPause ();
SCR_CheckDrawCenterString ();
Sbar_Draw ();
SCR_DrawConsole ();
// FIXME: MENUCODE
// M_Draw ();
while (*scr_funcs) {
(*scr_funcs)(swap);
scr_funcs++;
}
}
// LordHavoc: adjustable brightness and contrast,

2
qw/source/keys.c
View file

@ -300,7 +300,7 @@ Key_Console (int key)
key_lines[edit_line][1] = 0;
key_linepos = 1;
if (cls.state == ca_disconnected)
SCR_UpdateScreen (realtime); // force an update, because the
CL_UpdateScreen (realtime); // force an update, because the
// command may take some time
return;

2
qw/source/sbar.c
View file

@ -721,7 +721,7 @@ Sbar_DrawNormal (void)
void
Sbar_Draw (void)
Sbar_Draw (int swap)
{
qboolean headsup;
char st[512];

283
qw/source/screen.c
View file

@ -44,15 +44,17 @@
#include "QF/draw.h"
#include "QF/keys.h"
#include "QF/pcx.h"
#include "QF/skin.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/screen.h"
#include "QF/sys.h"
#include "QF/texture.h"
#include "QF/vid.h"
#include "cl_parse.h"
#include "client.h"
#include "d_iface.h"
#include "host.h"
#include "r_cvar.h"
#include "r_local.h"
#include "sbar.h"
#include "view.h"
@ -138,7 +140,6 @@ qboolean scr_skipupdate;
qboolean block_drawing;
void SCR_ScreenShot_f (void);
void SCR_RSShot_f (void);
/*
CENTER PRINTING
@ -163,7 +164,7 @@ SCR_CenterPrint (char *str)
{
strncpy (scr_centerstring, str, sizeof (scr_centerstring) - 1);
scr_centertime_off = scr_centertime->value;
scr_centertime_start = cl.time;
scr_centertime_start = r_realtime;
// count the number of lines for centering
scr_center_lines = 1;
@ -185,8 +186,8 @@ SCR_DrawCenterString (void)
int remaining;
// the finale prints the characters one at a time
if (cl.intermission)
remaining = scr_printspeed->value * (cl.time - scr_centertime_start);
if (r_force_fullscreen /*FIXME*/)
remaining = scr_printspeed->value * (r_realtime - scr_centertime_start);
else
remaining = 9999;
@ -223,7 +224,7 @@ SCR_DrawCenterString (void)
void
SCR_CheckDrawCenterString (void)
SCR_CheckDrawCenterString (int swap)
{
scr_copytop = 1;
if (scr_center_lines > scr_erase_lines)
@ -231,7 +232,7 @@ SCR_CheckDrawCenterString (void)
scr_centertime_off -= host_frametime;
if (scr_centertime_off <= 0 && !cl.intermission)
if (scr_centertime_off <= 0 && !r_force_fullscreen /*FIXME*/)
return;
if (key_dest != key_game)
return;
@ -304,17 +305,14 @@ SCR_CalcRefdef (void)
size = scr_viewsize->int_val;
}
// intermission is always full screen
if (cl.intermission) {
if (r_force_fullscreen /*FIXME*/) {
full = true;
size = 100.0;
sb_lines = 0;
}
size /= 100.0;
if (!cl_sbar->int_val && full)
h = vid.height;
else
h = vid.height - sb_lines;
h = vid.height - r_lineadj;
r_refdef.vrect.width = vid.width * size + 0.5;
if (r_refdef.vrect.width < 96) {
@ -323,11 +321,8 @@ SCR_CalcRefdef (void)
}
r_refdef.vrect.height = vid.height * size + 0.5;
if (cl_sbar->int_val || !full) {
if (r_refdef.vrect.height > vid.height - sb_lines)
r_refdef.vrect.height = vid.height - sb_lines;
} else if (r_refdef.vrect.height > vid.height)
r_refdef.vrect.height = vid.height;
if (r_refdef.vrect.height > vid.height - r_lineadj)
r_refdef.vrect.height = vid.height - r_lineadj;
r_refdef.vrect.x = (vid.width - r_refdef.vrect.width) / 2;
if (full)
r_refdef.vrect.y = 0;
@ -347,7 +342,7 @@ SCR_CalcRefdef (void)
vrect.width = vid.width;
vrect.height = vid.height;
R_SetVrect (&vrect, &scr_vrect, cl_sbar->int_val ? sb_lines : 0);
R_SetVrect (&vrect, &scr_vrect, r_lineadj);
// guard against going from one mode to another that's less than half the
// vertical resolution
@ -355,7 +350,7 @@ SCR_CalcRefdef (void)
scr_con_current = vid.height;
// notify the refresh of the change
R_ViewChanged (&vrect, cl_sbar->int_val ? sb_lines : 0, vid.aspect);
R_ViewChanged (&vrect, r_lineadj, vid.aspect);
}
@ -397,7 +392,6 @@ SCR_Init (void)
// register our commands
//
Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "Take a screenshot and write it as qfxxx.tga in the current directory");
Cmd_AddCommand ("snap", SCR_RSShot_f, "Take a screenshot and upload it to the server");
Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "Increase the size of the screen");
Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "Decrease the size of the screen");
@ -410,7 +404,7 @@ SCR_Init (void)
void
SCR_DrawRam (void)
SCR_DrawRam (int swap)
{
if (!scr_showram->int_val)
return;
@ -423,7 +417,7 @@ SCR_DrawRam (void)
void
SCR_DrawTurtle (void)
SCR_DrawTurtle (int swap)
{
static int count;
@ -443,24 +437,11 @@ SCR_DrawTurtle (void)
}
void
SCR_DrawNet (void)
{
if (cls.netchan.outgoing_sequence - cls.netchan.incoming_acknowledged <
UPDATE_BACKUP - 1)
return;
if (cls.demoplayback)
return;
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
extern cvar_t *show_fps;
extern cvar_t *show_time;
void
SCR_DrawFPS (void)
SCR_DrawFPS (int swap)
{
static double lastframetime;
double t;
@ -489,7 +470,7 @@ SCR_DrawFPS (void)
} else {
i = 80;
}
x = cl_hudswap->int_val ? vid.width - ((strlen (st) * 8) + i) : i;
x = swap ? vid.width - ((strlen (st) * 8) + i) : i;
y = vid.height - (sb_lines + 8);
Draw_String8 (x, y, st);
}
@ -502,7 +483,7 @@ SCR_DrawFPS (void)
Written by Misty, rewritten by Deek
*/
void
SCR_DrawTime (void)
SCR_DrawTime (int swap)
{
int x, y;
char st[80];
@ -527,21 +508,21 @@ SCR_DrawTime (void)
// Print it next to the fps meter
strftime (st, sizeof (st), timefmt, local);
x = cl_hudswap->int_val ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
x = swap ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
y = vid.height - (sb_lines + 8);
Draw_String8 (x, y, st);
}
void
SCR_DrawPause (void)
SCR_DrawPause (int swap)
{
qpic_t *pic;
if (!scr_showpause->int_val) // turn off for screenshots
return;
if (!cl.paused)
if (!r_paused)
return;
pic = Draw_CachePic ("gfx/pause.lmp", true);
@ -559,7 +540,7 @@ SCR_SetUpToDrawConsole (void)
Con_CheckResize ();
// decide on the height of the console
if (cls.state != ca_active) {
if (!r_active) {
scr_conlines = vid.height; // full screen
scr_con_current = scr_conlines;
} else if (key_dest == key_console)
@ -587,7 +568,7 @@ SCR_SetUpToDrawConsole (void)
void
SCR_DrawConsole (void)
SCR_DrawConsole (int swap)
{
if (scr_con_current) {
scr_copyeverything = 1;
@ -605,6 +586,68 @@ SCR_DrawConsole (void)
SCREEN SHOTS
*/
tex_t *
SCR_ScreenShot (int width, int height)
{
int x, y;
unsigned char *src, *dest;
int w, h;
int dx, dy, dex, dey, nx;
int r, b, g;
int count;
float fracw, frach;
tex_t *tex;
// enable direct drawing of console to back buffer
D_EnableBackBufferAccess ();
w = (vid.width < width) ? vid.width : width;
h = (vid.height < height) ? vid.height : height;
fracw = (float) vid.width / (float) w;
frach = (float) vid.height / (float) h;
tex = Hunk_TempAlloc (sizeof (tex_t) + w * h);
if (!tex)
return 0;
for (y = 0; y < h; y++) {
dest = tex->data + (w * y);
for (x = 0; x < w; x++) {
r = g = b = 0;
dx = x * fracw;
dex = (x + 1) * fracw;
if (dex == dx)
dex++; // at least one
dy = y * frach;
dey = (y + 1) * frach;
if (dey == dy)
dey++; // at least one
count = 0;
for ( /* */ ; dy < dey; dy++) {
src = vid.buffer + (vid.rowbytes * dy) + dx;
for (nx = dx; nx < dex; nx++) {
r += vid_basepal[*src * 3];
g += vid_basepal[*src * 3 + 1];
b += vid_basepal[*src * 3 + 2];
src++;
count++;
}
}
r /= count;
g /= count;
b /= count;
*dest++ = MipColor (r, g, b);
}
}
// for adapters that can't stay mapped in for linear writes all the time
D_DisableBackBufferAccess ();
return tex;
}
void
SCR_ScreenShot_f (void)
@ -703,10 +746,12 @@ SCR_DrawCharToSnap (int num, byte * dest, int width)
void
SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
SCR_DrawStringToSnap (const char *s, tex_t *tex, int x, int y)
{
byte *buf = tex->data;
byte *dest;
const unsigned char *p;
int width = tex->width;
dest = buf + ((y * width) + x);
@ -718,109 +763,6 @@ SCR_DrawStringToSnap (const char *s, byte * buf, int x, int y, int width)
}
void
SCR_RSShot_f (void)
{
int x, y;
unsigned char *src, *dest;
char pcxname[80];
pcx_t *pcx;
int pcx_len;
unsigned char *newbuf;
int w, h;
int dx, dy, dex, dey, nx;
int r, b, g;
int count;
float fracw, frach;
char st[80];
time_t now;
if (CL_IsUploading ())
return; // already one pending
if (cls.state < ca_onserver)
return; // gotta be connected
Con_Printf ("Remote screen shot requested.\n");
snprintf (pcxname, sizeof (pcxname), "rss.pcx");
//
// save the pcx file
//
D_EnableBackBufferAccess (); // enable direct drawing of console
// to back
// buffer
w = (vid.width < RSSHOT_WIDTH) ? vid.width : RSSHOT_WIDTH;
h = (vid.height < RSSHOT_HEIGHT) ? vid.height : RSSHOT_HEIGHT;
fracw = (float) vid.width / (float) w;
frach = (float) vid.height / (float) h;
newbuf = calloc (1, w * h);
for (y = 0; y < h; y++) {
dest = newbuf + (w * y);
for (x = 0; x < w; x++) {
r = g = b = 0;
dx = x * fracw;
dex = (x + 1) * fracw;
if (dex == dx)
dex++; // at least one
dy = y * frach;
dey = (y + 1) * frach;
if (dey == dy)
dey++; // at least one
count = 0;
for ( /* */ ; dy < dey; dy++) {
src = vid.buffer + (vid.rowbytes * dy) + dx;
for (nx = dx; nx < dex; nx++) {
r += vid_basepal[*src * 3];
g += vid_basepal[*src * 3 + 1];
b += vid_basepal[*src * 3 + 2];
src++;
count++;
}
}
r /= count;
g /= count;
b /= count;
*dest++ = MipColor (r, g, b);
}
}
time (&now);
strcpy (st, ctime (&now));
st[strlen (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 0, w);
strncpy (st, cls.servername, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 10, w);
strncpy (st, cl_name->string, sizeof (st));
st[sizeof (st) - 1] = 0;
SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 20, w);
pcx = EncodePCX (newbuf, w, h, w, vid_basepal, false, &pcx_len);
CL_StartUpload ((void *)pcx, pcx_len);
free (newbuf);
D_DisableBackBufferAccess (); // for adapters that can't stay
// mapped in
// for linear writes all the time
Con_Printf ("Wrote %s\n", pcxname);
Con_Printf ("Sending shot to server...\n");
}
//=============================================================================
@ -872,7 +814,7 @@ SCR_DrawNotifyString (void)
needs almost the entire 256k of stack space!
*/
void
SCR_UpdateScreen (double realtime)
SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs, int swap)
{
static int oldscr_viewsize;
vrect_t vrect;
@ -917,11 +859,6 @@ SCR_UpdateScreen (double realtime)
vid.recalc_refdef = true;
}
if (oldsbar != cl_sbar->int_val) {
oldsbar = cl_sbar->int_val;
vid.recalc_refdef = true;
}
if (vid.recalc_refdef) {
// something changed, so reorder the screen
SCR_CalcRefdef ();
@ -954,30 +891,16 @@ SCR_UpdateScreen (double realtime)
D_EnableBackBufferAccess (); // of all overlay stuff if drawing
// directly
if (cl.intermission == 1 && key_dest == key_game) {
if (r_force_fullscreen /*FIXME*/ == 1 && key_dest == key_game) {
Sbar_IntermissionOverlay ();
} else if (cl.intermission == 2 && key_dest == key_game) {
} else if (r_force_fullscreen /*FIXME*/ == 2 && key_dest == key_game) {
Sbar_FinaleOverlay ();
SCR_CheckDrawCenterString ();
SCR_CheckDrawCenterString (swap);
} else {
if (crosshair->int_val)
Draw_Crosshair ();
SCR_DrawRam ();
SCR_DrawNet ();
if (r_netgraph->int_val)
CL_NetGraph ();
SCR_DrawFPS ();
SCR_DrawTime ();
SCR_DrawTurtle ();
SCR_DrawPause ();
SCR_CheckDrawCenterString ();
Sbar_Draw ();
SCR_DrawConsole ();
// FIXME: MENUCODE
// M_Draw ();
while (*scr_funcs) {
(*scr_funcs)(swap);
scr_funcs++;
}
}
@ -1019,11 +942,3 @@ SCR_UpdateScreen (double realtime)
VID_Update (&vrect);
}
}
void
SCR_UpdateWholeScreen (double realtime)
{
scr_fullupdate = 0;
SCR_UpdateScreen (realtime);
}