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

Code style, people. Love it or leave it!

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2003-03-21 21:25:44 +00:00
parent 16eac174e6
commit 5fb8aa07f3
26 changed files with 400 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qw/source/cl_parse.c
View file

@ -1164,7 +1164,9 @@ CL_MuzzleFlash (void)
dl->color[2] = 0.05;
}
#define SHOWNET(x) if (cl_shownet->int_val == 2) Con_Printf ("%3i:%s\n", net_message->readcount-1, x);
#define SHOWNET(x) \
if (cl_shownet->int_val == 2) \
Con_Printf ("%3i:%s\n", net_message->readcount-1, x);
int received_framecount;

74
qw/source/cl_slist.c
View file

@ -233,14 +233,12 @@ SL_CheckFilter (server_entry_t *sl_filteritem)
return (1);
if (!sl_filteritem->status)
return (0);
if (strlen(sl_game->string))
{
if (strlen (sl_game->string)) {
if (strcasecmp (Info_ValueForKey (sl_filteritem->status, "*gamedir"),
sl_game->string) != 0)
return (0);
}
if (sl_ping->int_val)
{
if (sl_ping->int_val) {
if (!sl_filteritem->pongback)
return (0);
if (((int) (sl_filteritem->pongback * 1000)) >= sl_ping->int_val)
@ -380,13 +378,10 @@ SL_SortEntry (server_entry_t *start)
if (!start || !sl_sortby)
return;
for (q = start->next; q; q = q->next)
{
if (sl_sortby->int_val)
{
for (q = start->next; q; q = q->next) {
if (sl_sortby->int_val) {
if ((q->pongback) && (start->pongback) && (start->pongback >
q->pongback))
{
q->pongback)) {
SL_Swap (start, q);
q = start;
}
@ -396,8 +391,7 @@ SL_SortEntry (server_entry_t *start)
while ((start->desc[i] != '\0') && (q->desc[i] != '\0') &&
(toupper (start->desc[i]) == toupper (q->desc[i])))
i++;
if (toupper(start->desc[i]) > toupper(q->desc[i]))
{
if (toupper (start->desc[i]) > toupper (q->desc[i])) {
SL_Swap (start, q);
q = start;
}
@ -425,8 +419,7 @@ SL_Con_List (server_entry_t *sldata)
SL_Sort (sl_sortby);
for(serv = 0; serv < SL_Len (sldata); serv++)
{
for (serv = 0; serv < SL_Len (sldata); serv++) {
cp = SL_Get_By_Num (sldata, serv);
if (!cp)
break;
@ -476,8 +469,7 @@ SL_Con_Details (server_entry_t *sldata, int slitemno)
Con_Printf ("%i\n", (int) (cp->pongback * 1000));
else
Con_Printf ("N/A\n");
if (cp->status)
{
if (cp->status) {
char *s;
Con_Printf ("Name: %s\n", cp->desc);
@ -523,8 +515,7 @@ SL_MasterUpdate(void)
static int
SL_Switch (void)
{
if (!which_slist)
{
if (!which_slist) {
fav_slist = slist;
slist = all_slist;
which_slist = 1;
@ -544,50 +535,38 @@ SL_Command (void)
if (Cmd_Argc () == 1)
SL_Con_List (slist);
else if (strcasecmp(Cmd_Argv(1),"switch") == 0)
{
else if (strcasecmp (Cmd_Argv (1), "switch") == 0) {
if (SL_Switch ())
Con_Printf ("Switched to Server List from Masters\n");
else
Con_Printf ("Switched to Favorite Server List\n");
}
else if (strcasecmp(Cmd_Argv(1),"refresh") == 0)
{
} else if (strcasecmp (Cmd_Argv (1), "refresh") == 0) {
if (Cmd_Argc () == 2)
SL_Update (slist);
else
Con_Printf ("Syntax: slist refresh\n");
}
else if (strcasecmp(Cmd_Argv(1),"update") == 0)
{
if (Cmd_Argc () == 2)
{
} else if (strcasecmp (Cmd_Argv (1),"update") == 0) {
if (Cmd_Argc () == 2) {
if (!which_slist)
Con_Printf ("ERROR: This of for updating the servers from a "
"list of masters\n");
else
SL_MasterUpdate ();
}
else
} else
Con_Printf ("Syntax: slist update\n");
}
else if (strcasecmp(Cmd_Argv(1),"connect") == 0)
{
if (Cmd_Argc () == 3)
{
} else if (strcasecmp (Cmd_Argv (1), "connect") == 0) {
if (Cmd_Argc () == 3) {
sltemp = atoi (Cmd_Argv (2));
if (sltemp && (sltemp <= SL_Len (slist)))
SL_Connect (slist, sltemp);
else
Con_Printf("Error: Invalid Server Number -> %s\n",Cmd_Argv(2));
}
else if ((Cmd_Argc () == 2) && slist_last_details)
Con_Printf ("Error: Invalid Server Number -> %s\n",
Cmd_Argv (2));
} else if ((Cmd_Argc () == 2) && slist_last_details)
SL_Connect (slist, slist_last_details);
else
Con_Printf ("Syntax: slist connect #\n");
}
else
{
} else {
sltemp = atoi (Cmd_Argv (1));
if ((Cmd_Argc () == 2) && sltemp && (sltemp <= SL_Len (slist)))
SL_Con_Details (slist, sltemp);
@ -599,14 +578,14 @@ MSL_ParseServerList(const char *msl_data)
{
int msl_ptr;
for (msl_ptr = 0; msl_ptr < strlen(msl_data); msl_ptr = msl_ptr + 6)
{
for (msl_ptr = 0; msl_ptr < strlen (msl_data); msl_ptr = msl_ptr + 6) {
slist = SL_Add (slist, va ("%i.%i.%i.%i:%i",
(byte) msl_data[msl_ptr],
(byte) msl_data[msl_ptr+1],
(byte) msl_data[msl_ptr+2],
(byte) msl_data[msl_ptr+3],
((byte)msl_data[msl_ptr+4]<<8)|(byte)msl_data[msl_ptr+5]), NULL);
((byte) msl_data[msl_ptr + 4] << 8)
| (byte) msl_data[msl_ptr + 5]), NULL);
}
}
@ -688,12 +667,11 @@ SL_CheckStatus (const char *cs_from, const char *cs_data)
server_entry_t *temp;
for (temp = slist; temp; temp = temp->next)
if (temp->waitstatus)
{
if (strcmp (cs_from, temp->server) == 0)
{
if (temp->waitstatus) {
if (strcmp (cs_from, temp->server) == 0) {
int i;
char *data = strdup (cs_data);
strcpy (data, cs_data);
for (i = 0; i < strlen (data); i++)
if (data[i] == '\n') {

4
qw/source/crudefile.c
View file

@ -390,8 +390,8 @@ CF_EOF (int desc)
/*
CF_Quota
cfquota returns the number of characters left in the quota, or
<= 0 if it's met or (somehow) exceeded.
returns the number of characters left in the quota, or <= 0 if it's met or
(somehow) exceeded.
*/
int
CF_Quota ()

6
qw/source/locs.c
View file

@ -211,10 +211,8 @@ locs_save (const char *filename, qboolean gz)
return;
}
for (i = 0; i < locations_count; i++)
Qprintf(locfd,"%.0f %.0f %.0f %s\n",
locations[i]->loc[0] * 8,
locations[i]->loc[1] * 8,
locations[i]->loc[2] * 8,
Qprintf (locfd,"%.0f %.0f %.0f %s\n", locations[i]->loc[0] * 8,
locations[i]->loc[1] * 8, locations[i]->loc[2] * 8,
locations[i]->name);
Qclose (locfd);
}

2
qw/source/sbar.c
View file

@ -928,7 +928,7 @@ Sbar_LogFrags (void)
char conv2[512];
char *cp = NULL;
QFile *file = NULL;
int minutes, fph, total, f, i, k, l, p, d;
int minutes, fph, total, d, f, i, k, l, p;
player_info_t *s = NULL;
const char *t = NULL;
time_t tt = time (NULL);

12
qw/source/sv_ccmds.c
View file

@ -581,8 +581,7 @@ SV_Cuff_f (void)
if (cl) {
cl->cuff_time = realtime + mins * 60.0;
if (mins) {
sprintf(text,
"You are cuffed for %.1f minutes\n\n"
sprintf (text, "You are cuffed for %.1f minutes\n\n"
"reconnecting won't help...\n", mins);
ClientReliableWrite_Begin (cl, svc_centerprint, 2 + strlen (text));
ClientReliableWrite_String (cl, text);
@ -595,10 +594,10 @@ SV_Cuff_f (void)
cl->cuff_time = realtime + mins * 60.0;
done = true;
if (mins) {
sprintf(text,
"You are cuffed for %.1f minutes\n\n"
sprintf (text, "You are cuffed for %.1f minutes\n\n"
"reconnecting won't help...\n", mins);
ClientReliableWrite_Begin(cl,svc_centerprint, 2+strlen(text));
ClientReliableWrite_Begin (cl, svc_centerprint,
2 + strlen (text));
ClientReliableWrite_String (cl, text);
}
}
@ -659,7 +658,8 @@ SV_Mute_f (void)
if (mins) {
sprintf (text, "You are muted for %.1f minutes\n\n"
"reconnecting won't help...\n", mins);
ClientReliableWrite_Begin(cl,svc_centerprint, 2+strlen(text));
ClientReliableWrite_Begin (cl, svc_centerprint,
2 + strlen (text));
ClientReliableWrite_String (cl, text);
}
}

5
qw/source/sv_demo.c
View file

@ -61,8 +61,6 @@ demo_t demo;
demobuffer->start - demobuffer->end : \
demobuffer->maxsize - demobuffer->end)
static int demo_max_size;
static int demo_size;
cvar_t *sv_demoUseCache;
@ -1223,7 +1221,8 @@ SV_EasyRecord_f (void)
}
// Make sure the filename doesn't contain illegal characters
dsprintf (name2, "%s/%s/%s/%s%s%s", fs_userpath->string, qfs_gamedir->dir.def, sv_demoDir->string,
dsprintf (name2, "%s/%s/%s/%s%s%s", fs_userpath->string,
qfs_gamedir->dir.def, sv_demoDir->string,
sv_demoPrefix->string, SV_CleanName (name->str),
sv_demoSuffix->string);
QFS_CreatePath (name2->str);

15
qw/source/sv_gib.c
View file

@ -87,9 +87,11 @@ SV_GIB_Client_GetKeys_f (void)
if (GIB_Argc () != 2)
GIB_USAGE ("");
else if (!(cl = SV_GIB_GetClient (atoi (GIB_Argv (1)))))
GIB_Error ("uid", "No user with id '%s' was found on the server.", GIB_Argv(1));
GIB_Error ("uid", "No user with id '%s' was found on the server.",
GIB_Argv (1));
else if (GIB_CanReturn ()) {
info_key_t **key, **keys = (info_key_t **) Hash_GetList (cl->userinfo->tab);
info_key_t **key, **keys =
(info_key_t **) Hash_GetList (cl->userinfo->tab);
for (key = keys; *key; key++)
dstring_appendstr (GIB_Return (0), (*key)->key);
free (keys);
@ -105,7 +107,8 @@ SV_GIB_Client_GetInfo_f (void)
if (GIB_Argc () != 3)
GIB_USAGE ("");
else if (!(cl = SV_GIB_GetClient (atoi (GIB_Argv (1)))))
GIB_Error ("uid", "No user with id '%s' was found on the server.", GIB_Argv(1));
GIB_Error ("uid", "No user with id '%s' was found on the server.",
GIB_Argv (1));
else if ((str = Info_ValueForKey (cl->userinfo, GIB_Argv (2))))
GIB_Return (str);
}
@ -118,9 +121,11 @@ SV_GIB_Client_Print_f (void)
if (GIB_Argc () != 3)
GIB_USAGE ("uid message");
else if (!(cl = SV_GIB_GetClient (atoi (GIB_Argv (1)))))
GIB_Error ("uid", "No user with id '%s' was found on the server.", GIB_Argv(1));
GIB_Error ("uid", "No user with id '%s' was found on the server.",
GIB_Argv (1));
else
SV_ClientPrintf (0, cl, GIB_Argv(0)[13] ? PRINT_CHAT : PRINT_HIGH, "%s", GIB_Argv(2));
SV_ClientPrintf (0, cl, GIB_Argv (0)[13] ? PRINT_CHAT : PRINT_HIGH,
"%s", GIB_Argv (2));
}
static void

3
qw/source/sv_main.c
View file

@ -386,7 +386,8 @@ SV_DropClient (client_t *drop)
// Trigger GIB event
if (sv_client_disconnect_e->func)
GIB_Event_Callback (sv_client_disconnect_e, 1, va("%u", drop->userid));
GIB_Event_Callback (sv_client_disconnect_e, 1,
va ("%u", drop->userid));
}
int

2
qw/source/sv_pr_cmds.c
View file

@ -1731,7 +1731,7 @@ PF_Fixme (progs_t *pr)
static void
PF_Checkextension (progs_t *pr)
{
R_FLOAT(pr) = 0; //FIXME make this function actually useful :P
R_FLOAT (pr) = 0; // FIXME: make this function actually useful :P
}
static void

6
qw/source/sv_send.c
View file

@ -913,8 +913,7 @@ SV_SendDemoMessage(void)
if (sv.time - demo.time < 1.0 / min_fps)
return;
for (i=0, c = svs.clients ; i<MAX_CLIENTS ; i++, c++)
{
for (i = 0, c = svs.clients ; i<MAX_CLIENTS ; i++, c++) {
if (c->state != cs_spawned)
continue; // datagrams only go to spawned
@ -975,7 +974,8 @@ SV_SendDemoMessage(void)
SZ_Clear (&demo.datagram);
}
demo.recorder.delta_sequence = demo.recorder.netchan.incoming_sequence&255;
demo.recorder.delta_sequence =
demo.recorder.netchan.incoming_sequence & 255;
demo.recorder.netchan.incoming_sequence++;
demo.frames[demo.parsecount & DEMO_FRAMES_MASK].time = demo.time = sv.time;

9
qw/source/sv_user.c
View file

@ -171,7 +171,8 @@ SV_New_f (ucmd_t *cmd)
// Trigger GIB connection event
if (sv_client_connect_e->func)
GIB_Event_Callback (sv_client_connect_e, 1, va("%u", host_client->userid));
GIB_Event_Callback (sv_client_connect_e, 1, va ("%u",
host_client->userid));
}
static void
@ -546,7 +547,8 @@ SV_Begin_f (ucmd_t *cmd)
// Trigger GIB events
if (sv_client_spawn_e->func)
GIB_Event_Callback (sv_client_spawn_e, 1, va("%u", host_client->userid));
GIB_Event_Callback (sv_client_spawn_e, 1, va ("%u",
host_client->userid));
}
//=============================================================================
@ -824,7 +826,8 @@ SV_Say (qboolean team)
}
if (sv_chat_e->func)
GIB_Event_Callback (sv_chat_e, 2, va("%i", host_client->userid), p, type);
GIB_Event_Callback (sv_chat_e, 2, va ("%i", host_client->userid), p,
type);
strncat (text, p, sizeof (text) - strlen (text));
strncat (text, "\n", sizeof (text) - strlen (text));