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

Whitespace, and a workaround for show_* misplacement.

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2003-03-03 19:20:44 +00:00
parent d469a06620
commit 2000954a2c
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -327,7 +327,7 @@ SCR_DrawFPS (void)
} }
x = hudswap ? vid.width - ((strlen (st) * 8) + i) : i; x = hudswap ? vid.width - ((strlen (st) * 8) + i) : i;
y = vid.height - r_lineadj - 8; y = vid.height - sb_lines - 8;
Draw_String (x, y, st); Draw_String (x, y, st);
} }
@ -363,7 +363,7 @@ SCR_DrawTime (void)
// Print it at far left/right of screen // Print it at far left/right of screen
x = hudswap ? (vid.width - ((strlen (st) * 8) + 8)) : 8; x = hudswap ? (vid.width - ((strlen (st) * 8) + 8)) : 8;
y = vid.height - (r_lineadj + 8); y = vid.height - sb_lines - 8;
Draw_String (x, y, st); Draw_String (x, y, st);
} }

8
qw/source/cl_parse.c
View file

@ -1291,9 +1291,9 @@ CL_ParseServerMessage (void)
if (!cls.demoplayback2) { if (!cls.demoplayback2) {
MSG_ReadAngleV (net_message, cl.viewangles); MSG_ReadAngleV (net_message, cl.viewangles);
} else { } else {
j = MSG_ReadByte(net_message); j = MSG_ReadByte (net_message);
//fixangle |= 1 << j; // fixangle |= 1 << j;
if (j != Cam_TrackNum()) { if (j != Cam_TrackNum ()) {
MSG_ReadAngle (net_message); MSG_ReadAngle (net_message);
MSG_ReadAngle (net_message); MSG_ReadAngle (net_message);
MSG_ReadAngle (net_message); MSG_ReadAngle (net_message);
@ -1418,7 +1418,7 @@ CL_ParseServerMessage (void)
// automatic fraglogging (by elmex) // automatic fraglogging (by elmex)
// XXX: Should this _really_ called here? // XXX: Should this _really_ called here?
if (!cls.demoplayback) if (!cls.demoplayback)
Sbar_LogFrags(); Sbar_LogFrags ();
break; break;
case svc_finale: case svc_finale:

7
qw/source/cl_screen.c
View file

@ -56,6 +56,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "r_cvar.h" #include "r_cvar.h"
#include "sbar.h" #include "sbar.h"
static void static void
SCR_DrawNet (void) SCR_DrawNet (void)
{ {
@ -77,8 +78,10 @@ CL_NetStats (void)
return; return;
if (cls.state != ca_active) if (cls.state != ca_active)
return; return;
x = hudswap ? vid.width - 104 : 0; x = hudswap ? vid.width - 104 : 0;
y = vid.height - sb_lines - 16; y = vid.height - sb_lines - 16;
// request new ping times every two seconds // request new ping times every two seconds
if (!cls.demoplayback && realtime - cl.last_ping_request > 2) { if (!cls.demoplayback && realtime - cl.last_ping_request > 2) {
cl.last_ping_request = realtime; cl.last_ping_request = realtime;
@ -87,6 +90,7 @@ CL_NetStats (void)
} }
if (show_ping->int_val) { if (show_ping->int_val) {
int ping = cl.players[cl.playernum].ping; int ping = cl.players[cl.playernum].ping;
ping = bound (0, ping, 999); ping = bound (0, ping, 999);
Draw_String (x, y, va ("%3d ms", ping)); Draw_String (x, y, va ("%3d ms", ping));
x+= 48; x+= 48;
@ -94,7 +98,7 @@ CL_NetStats (void)
x += 56; x += 56;
} }
if (show_ping->int_val && show_pl->int_val) { if (show_ping->int_val && show_pl->int_val) {
Draw_String(x, y, "/"); Draw_String (x, y, "/");
x += 8; x += 8;
} }
if (show_pl->int_val) { if (show_pl->int_val) {
@ -120,7 +124,6 @@ static SCR_Func scr_funcs[] = {
0 0
}; };
void void
CL_UpdateScreen (double realtime) CL_UpdateScreen (double realtime)
{ {