audited all Sys_Quit calls and gave them return values indicating

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index d60489b35b390b0ee4c709b7f9e3a7b0a22291a3..a740a416c329ab36d6995d6ab2efb77b7299121f 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -38,7 +38,7 @@ Host_Quit_f
 
 void Host_Quit_f (void)
 {
-       Sys_Quit ();
+       Sys_Quit (0);
 }
 
 
@@ -1955,17 +1955,19 @@ void Host_SendCvar_f (void)
 {
        int             i;
        cvar_t  *c;
+       const char *cvarname;
        client_t *old;
 
        if(Cmd_Argc() != 2)
                return;
-       c = Cvar_FindVar(Cmd_Argv(1));
+       cvarname = Cmd_Argv(1);
        if (cls.state == ca_connected)
        {
+               c = Cvar_FindVar(cvarname);
                // LordHavoc: if there is no such cvar or if it is private, send a
                // reply indicating that it has no value
                if(!c || (c->flags & CVAR_PRIVATE))
-                       Cmd_ForwardStringToServer(va("sentcvar %s\n", c->name));
+                       Cmd_ForwardStringToServer(va("sentcvar %s\n", cvarname));
                else
                        Cmd_ForwardStringToServer(va("sentcvar %s \"%s\"\n", c->name, c->string));
                return;
@@ -1982,7 +1984,7 @@ void Host_SendCvar_f (void)
                if(svs.clients[i].active && svs.clients[i].netconnection)
                {
                        host_client = &svs.clients[i];
-                       Host_ClientCommands(va("sendcvar %s\n", c->name));
+                       Host_ClientCommands(va("sendcvar %s\n", cvarname));
                }
        host_client = old;
 }
@@ -2322,8 +2324,10 @@ void Host_Pings_f (void)
        {
                packetloss = 0;
                if (svs.clients[i].netconnection)
-                       for (j = 0;j < 100;j++)
-                               packetloss += svs.clients[i].netconnection->packetlost[j];
+                       for (j = 0;j < NETGRAPH_PACKETS;j++)
+                               if (svs.clients[i].netconnection->incoming_unreliablesize[j] == NETGRAPH_LOSTPACKET)
+                                       packetloss++;
+               packetloss = packetloss * 100 / NETGRAPH_PACKETS;
                ping = (int)floor(svs.clients[i].ping*1000+0.5);
                ping = bound(0, ping, 9999);
                if (sv.protocol == PROTOCOL_QUAKEWORLD)