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

ping/pl/fps/time now stays put and is now in the client rather than the

Browse source 
renderer (so nq is currently missing it)
This commit is contained in:
Bill Currie 2003-05-08 05:49:57 +00:00
parent 878c1c59ba
commit 0a5f3c31eb
5 changed files with 94 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
libs/video/renderer/r_screen.c
View file

@ -38,8 +38,6 @@ static __attribute__ ((unused)) const char rcsid[] =
# include <strings.h>
#endif
#include <time.h>
#include "QF/cmd.h"
#include "QF/console.h"
#include "QF/cvar.h"
@ -294,79 +292,6 @@ SCR_DrawTurtle (void)
Draw_Pic (scr_vrect.x, scr_vrect.y, scr_turtle);
}
extern int fps_count; //FIXME
void
SCR_DrawFPS (void)
{
char st[80];
double t;
static double lastframetime;
int i, x, y;
static int lastfps;
if (!show_fps->int_val)
return;
t = Sys_DoubleTime ();
if ((t - lastframetime) >= 1.0) {
lastfps = fps_count;
fps_count = 0;
lastframetime = t;
}
snprintf (st, sizeof (st), "%3d FPS", lastfps);
// FIXME! This is evil. -- Deek
// calculate the location of the clock
if (show_time->int_val <= 0) {
i = 8;
} else if (show_time->int_val == 1) {
i = 56;
} else {
i = 80;
}
x = hudswap ? vid.width - ((strlen (st) * 8) + i) : (unsigned int) i;
y = vid.height - sb_lines - 8;
Draw_String (x, y, st);
}
/*
SCR_DrawTime
Draw a clock on the screen
Written by Misty, rewritten by Deek.
*/
void
SCR_DrawTime (void)
{
char st[80];
const char *timefmt = NULL;
int x, y;
struct tm *local = NULL;
time_t utc = 0;
// any cvar that can take multiple settings must be able to handle abuse.
if (show_time->int_val <= 0)
return;
// Get local time
utc = time (NULL);
local = localtime (&utc);
if (show_time->int_val == 1) { // Use international format
timefmt = "%k:%M";
} else if (show_time->int_val >= 2) { // US AM/PM display
timefmt = "%l:%M %P";
}
strftime (st, sizeof (st), timefmt, local);
// Print it at far left/right of screen
x = hudswap ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
y = vid.height - sb_lines - 8;
Draw_String (x, y, st);
}
void
SCR_DrawPause (void)
{

2
nq/source/cl_screen.c
View file

@ -68,8 +68,6 @@ static SCR_Func scr_funcs[] = {
Draw_Crosshair,
SCR_DrawRam,
SCR_DrawNet,
SCR_DrawFPS,
SCR_DrawTime,
SCR_DrawTurtle,
SCR_DrawPause,
SCR_CheckDrawCenterString,

1
qw/include/client.h
View file

@ -346,6 +346,7 @@ extern qboolean nomaster;
extern char *server_version; // version of server we connected to
extern double realtime;
extern int fps_count;
extern struct cbuf_s *cl_cbuf;
extern struct cbuf_s *cl_stbuf;

42
qw/source/cl_screen.c
View file

@ -69,53 +69,11 @@ SCR_DrawNet (void)
Draw_Pic (scr_vrect.x + 64, scr_vrect.y, scr_net);
}
static void
CL_NetStats (void)
{
int x, y;
if (!show_ping->int_val && !show_pl->int_val)
return;
if (cls.state != ca_active)
return;
x = hudswap ? vid.width - 104 : 0;
y = vid.height - sb_lines - 16;
// request new ping times every two seconds
if (!cls.demoplayback && realtime - cl.last_ping_request > 2) {
cl.last_ping_request = realtime;
MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
SZ_Print (&cls.netchan.message, "pings");
}
if (show_ping->int_val) {
int ping = cl.players[cl.playernum].ping;
ping = bound (0, ping, 999);
Draw_String (x, y, va ("%3d ms", ping));
x+= 48;
} else if (hudswap) {
x += 56;
}
if (show_ping->int_val && show_pl->int_val) {
Draw_String (x, y, "/");
x += 8;
}
if (show_pl->int_val) {
int lost = CL_CalcNet ();
lost = bound (0, lost, 999);
Draw_String (x, y, va ("%3d pl", lost));
}
}
static SCR_Func scr_funcs[] = {
Draw_Crosshair,
SCR_DrawRam,
SCR_DrawNet,
CL_NetGraph,
CL_NetStats,
SCR_DrawFPS,
SCR_DrawTime,
SCR_DrawTurtle,
SCR_DrawPause,
SCR_CheckDrawCenterString,

98
qw/source/sbar.c
View file

@ -57,6 +57,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "bothdefs.h"
#include "cl_cam.h"
#include "cl_parse.h"
#include "client.h"
#include "compat.h"
#include "sbar.h"
@ -109,6 +110,7 @@ static view_t *hud_armament_view;
static view_t *hud_frags_view;
static view_t *overlay_view;
static view_t *stuff_view;
static void (*Sbar_Draw_DMO_func) (view_t *view, int l, int y, int skip);
static void Sbar_TeamOverlay (view_t *view);
@ -120,11 +122,14 @@ cl_hudswap_f (cvar_t *var)
hudswap = var->int_val;
if (hudswap) {
hud_armament_view->gravity = grav_southwest;
stuff_view->gravity = grav_southeast;
} else {
hud_armament_view->gravity = grav_southeast;
stuff_view->gravity = grav_southwest;
}
view_move (hud_armament_view, hud_armament_view->xpos,
hud_armament_view->ypos);
view_move (stuff_view, stuff_view->xpos, stuff_view->ypos);
}
static void
@ -1543,6 +1548,84 @@ draw_miniteam (view_t *view)
}
}
static void
draw_time (view_t *view)
{
struct tm *local = NULL;
time_t utc = 0;
const char *timefmt = NULL;
char st[80];
// Get local time
utc = time (NULL);
local = localtime (&utc);
if (show_time->int_val == 1) { // Use international format
timefmt = "%k:%M";
} else if (show_time->int_val >= 2) { // US AM/PM display
timefmt = "%l:%M %P";
}
strftime (st, sizeof (st), timefmt, local);
draw_string (view, 8, 8, st);
}
static void
draw_fps (view_t *view)
{
char st[80];
double t;
static double lastframetime;
static int lastfps;
t = Sys_DoubleTime ();
if ((t - lastframetime) >= 1.0) {
lastfps = fps_count;
fps_count = 0;
lastframetime = t;
}
snprintf (st, sizeof (st), "%3d FPS", lastfps);
draw_string (view, 80, 8, st);
}
static void
draw_net (view_t *view)
{
// request new ping times every two seconds
if (!cls.demoplayback && realtime - cl.last_ping_request > 2) {
cl.last_ping_request = realtime;
MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
SZ_Print (&cls.netchan.message, "pings");
}
if (show_ping->int_val) {
int ping = cl.players[cl.playernum].ping;
ping = bound (0, ping, 999);
draw_string (view, 0, 0, va ("%3d ms ", ping));
}
if (show_ping->int_val && show_pl->int_val)
draw_character (view, 48, 0, '/');
if (show_pl->int_val) {
int lost = CL_CalcNet ();
lost = bound (0, lost, 999);
draw_string (view, 56, 0, va ("%3d pl", lost));
}
}
static void
draw_stuff (view_t *view)
{
if (show_time->int_val > 0)
draw_time (view);
if (show_fps->int_val > 0)
draw_fps (view);
if (cls.state == ca_active && (show_ping->int_val || show_pl->int_val))
draw_net (view);
}
void
Sbar_IntermissionOverlay (void)
{
@ -1567,8 +1650,8 @@ static void
init_sbar_views (void)
{
view_t *view;
view_t *minifrags_view;
view_t *miniteam_view;
view_t *minifrags_view = 0;
view_t *miniteam_view = 0;
if (vid.conwidth < 512) {
sbar_view = view_new (0, 0, 320, 48, grav_south);
@ -1659,8 +1742,8 @@ static void
init_hud_views (void)
{
view_t *view;
view_t *minifrags_view;
view_t *miniteam_view;
view_t *minifrags_view = 0;
view_t *miniteam_view = 0;
if (vid.conwidth < 512) {
hud_view = view_new (0, 0, 320, 48, grav_south);
@ -1739,8 +1822,13 @@ init_views (void)
overlay_view->draw = draw_overlay;
overlay_view->visible = 0;
if (con_module)
stuff_view = view_new (0, 48, 144, 16, grav_southwest);
stuff_view->draw = draw_stuff;
if (con_module) {
view_insert (con_module->data->console->view, overlay_view, 0);
view_insert (con_module->data->console->view, stuff_view, 0);
}
init_sbar_views ();
init_hud_views ();