oops, this is in the server VM

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index 4436ae5b4f0a52e2566741164fa98a438b52d2f4..0640755657e81f56801059405622c1e3ef01daa9 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -26,6 +26,7 @@ int current_skill;
 cvar_t sv_cheats = {0, "sv_cheats", "0", "enables cheat commands in any game, and cheat impulses in dpmod"};
 cvar_t sv_adminnick = {CVAR_SAVE, "sv_adminnick", "", "nick name to use for admin messages instead of host name"};
 cvar_t sv_status_privacy = {CVAR_SAVE, "sv_status_privacy", "0", "do not show IP addresses in 'status' replies to clients"};
+cvar_t sv_status_show_qcstatus = {CVAR_SAVE, "sv_status_show_qcstatus", "0", "show the 'qcstatus' field in status replies, not the 'frags' field. Turn this on if your mod uses this field, and the 'frags' field on the other hand has no meaningful value."};
 cvar_t rcon_password = {CVAR_PRIVATE, "rcon_password", "", "password to authenticate rcon commands"};
 cvar_t rcon_address = {0, "rcon_address", "", "server address to send rcon commands to (when not connected to a server)"};
 cvar_t team = {CVAR_USERINFO | CVAR_SAVE, "team", "none", "QW team (4 character limit, example: blue)"};
@@ -58,11 +59,13 @@ Host_Status_f
 */
 void Host_Status_f (void)
 {
+       char qcstatus[256];
        client_t *client;
        int seconds = 0, minutes = 0, hours = 0, i, j, k, in, players, ping = 0, packetloss = 0;
        void (*print) (const char *fmt, ...);
        char ip[22];
-       
+       int frags;
+
        if (cmd_source == src_command)
        {
                // if running a client, try to send over network so the client's status report parser will see the report
@@ -79,6 +82,8 @@ void Host_Status_f (void)
        if (!sv.active)
                return;
        
+       SV_VM_Begin();
+       
        in = 0;
        if (Cmd_Argc() == 2)
        {
@@ -137,12 +142,31 @@ void Host_Status_f (void)
                        strlcpy(ip, client->netconnection ? "hidden" : "botclient" , 22);
                else
                        strlcpy(ip, (client->netconnection && client->netconnection->address) ? client->netconnection->address : "botclient", 22);
+
+               frags = client->frags;
+
+               if(sv_status_show_qcstatus.integer && prog->fieldoffsets.clientstatus >= 0)
+               {
+                       const char *str = PRVM_E_STRING(PRVM_EDICT_NUM(i + 1), prog->fieldoffsets.clientstatus);
+                       if(str && *str)
+                       {
+                               char *p;
+                               const char *q;
+                               p = qcstatus;
+                               for(q = str; *q && p != qcstatus + sizeof(qcstatus) - 1; ++q)
+                                       if(*q != '\\' && *q != '"' && !ISWHITESPACE(*q))
+                                               *p++ = *q;
+                               *p = 0;
+                               if(*qcstatus)
+                                       frags = atoi(qcstatus);
+                       }
+               }
                
                if (in == 0) // default layout
                {
                        print ("#%-3u ", i+1);
-                       print ("%-16.16s  ", client->name);
-                       print ("%3i  ", client->frags);
+                       print ("%-16.16s ", client->name);
+                       print ("%4i  ", frags);
                        print ("%2i:%02i:%02i\n   ", hours, minutes, seconds);
                        print ("%s\n", ip);
                }
@@ -153,7 +177,7 @@ void Host_Status_f (void)
                        print ("%2i ", packetloss);
                        print ("%4i ", ping);
                        print ("%2i:%02i:%02i ", hours, minutes, seconds);
-                       print ("%4i  ", client->frags);
+                       print ("%4i  ", frags);
                        print ("#%-3u ", i+1);
                        print ("^7%s\n", client->name);
                }
@@ -165,6 +189,8 @@ void Host_Status_f (void)
                        print ("^7%s\n", client->name);
                }
        }
+
+       SV_VM_End();
 }
 
 
@@ -530,7 +556,7 @@ void Host_Savegame_to (const char *name)
        // convert space to _ to make stdio happy
        // LordHavoc: convert control characters to _ as well
        for (i=0 ; i<SAVEGAME_COMMENT_LENGTH ; i++)
-               if (comment[i] <= ' ')
+               if (ISWHITESPACEORCONTROL(comment[i]))
                        comment[i] = '_';
        comment[SAVEGAME_COMMENT_LENGTH] = '\0';
 
@@ -1020,6 +1046,12 @@ void Host_Name_f (void)
                                i++;
                                continue;
                        }
+                       if (host_client->name[i+1] == STRING_COLOR_RGB_DEFAULT && isxdigit(host_client->name[i+2]) && isxdigit(host_client->name[i+3]) && isxdigit(host_client->name[i+4]))
+                       {
+                               j = i;
+                               i += 4;
+                               continue;
+                       }
                        if (host_client->name[i+1] == STRING_COLOR_TAG)
                        {
                                i++;
@@ -2317,7 +2349,7 @@ void Host_Rcon_f (void) // credit: taken from QuakeWorld
 
        for (i = 0;rcon_password.string[i];i++)
        {
-               if (rcon_password.string[i] <= ' ')
+               if (ISWHITESPACE(rcon_password.string[i]))
                {
                        Con_Printf("rcon_password is not allowed to have any whitespace.\n");
                        return;
@@ -2740,6 +2772,7 @@ void Host_InitCommands (void)
        Cvar_RegisterVariable(&sv_cheats);
        Cvar_RegisterVariable(&sv_adminnick);
        Cvar_RegisterVariable(&sv_status_privacy);
+       Cvar_RegisterVariable(&sv_status_show_qcstatus);
 }
 
 void Host_NoOperation_f(void)