test alpha

[xonotic/darkplaces.git] / sv_ccmds.c

diff --git a/sv_ccmds.c b/sv_ccmds.c
index b995ff7a2ad1c4de34677ac488adf4e98a39e2f6..1aabf9bc6f79234a52bb4644d8def4af5e52d442 100644 (file)
--- a/sv_ccmds.c
+++ b/sv_ccmds.c
@@ -740,11 +740,11 @@ static void SV_Status_f(cmd_state_t *cmd)
        print ("version:  %s build %s (gamename %s)\n", gamename, buildstring, gamenetworkfiltername);
        print ("protocol: %i (%s)\n", Protocol_NumberForEnum(sv.protocol), Protocol_NameForEnum(sv.protocol));
        print ("map:      %s\n", sv.name);
-       print ("timing:   %s\n", Host_TimingReport(vabuf, sizeof(vabuf)));
+       print ("timing:   %s\n", SV_TimingReport(vabuf, sizeof(vabuf)));
        print ("players:  %i active (%i max)\n\n", players, svs.maxclients);
 
        if (in == 1)
-               print ("^2IP                                             %%pl ping  time   frags  no   name\n");
+               print ("^2IP                                             %%pl ping buf  time   frags  no   name\n");
        else if (in == 2)
                print ("^5IP                                              no   name\n");
 
@@ -820,7 +820,7 @@ static void SV_Status_f(cmd_state_t *cmd)
                }
                else if (in == 1) // extended layout
                {
-                       print ("%s%-47s %2i %4i %2i:%02i:%02i %4i  #%-3u ^7%s\n", k%2 ? "^3" : "^7", ip, packetloss, ping, hours, minutes, seconds, frags, i+1, client->name);
+                       print ("%s%-47s %2i %4i %3u %2i:%02i:%02i %4i  #%-3u ^7%s\n", k%2 ? "^3" : "^7", ip, packetloss, ping, client->mbuf_s, hours, minutes, seconds, frags, i+1, client->name);
                }
                else if (in == 2) // reduced layout
                {
@@ -1459,9 +1459,9 @@ static void SV_Ent_Create_f(cmd_state_t *cmd)
                }
 
                /*
-               * This is mostly for dedicated server console, but if the
-               * player gave a custom origin, we can ignore the traceline.
-               */
+                * This is mostly for dedicated server console, but if the
+                * player gave a custom origin, we can ignore the traceline.
+                */
                if(!strcmp(Cmd_Argv(cmd, i), "origin"))
                        haveorigin = true;
 
@@ -1627,7 +1627,7 @@ void SV_InitOperatorCommands(void)
        Cmd_AddCommand(CF_SHARED, "maxplayers", SV_MaxPlayers_f, "sets limit on how many players (or bots) may be connected to the server at once");
        host.hook.SV_SendCvar = SV_SendCvar_f;
 
-       // commands that do not have automatic forwarding from cmd_client, these are internal details of the network protocol and not of interest to users (if they know what they are doing they can still use a generic "cmd prespawn" or similar)
+       // commands that do not have automatic forwarding from cmd_local, these are internal details of the network protocol and not of interest to users (if they know what they are doing they can still use a generic "cmd prespawn" or similar)
        Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "prespawn", SV_PreSpawn_f, "internal use - signon 1 (client acknowledges that server information has been received)");
        Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "spawn", SV_Spawn_f, "internal use - signon 2 (client has sent player information, and is asking server to send scoreboard rankings)");
        Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "begin", SV_Begin_f, "internal use - signon 3 (client asks server to start sending entities, and will go to signon 4 (playing) when the first entity update is received)");