]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - host_cmd.c
improved setinfo handling so that quakeworld works much better now (name/topcolor...
[xonotic/darkplaces.git] / host_cmd.c
index 70572dab2d1783567803d7ec5fbe48cc91aa5527..8ed2a8560671d4552ebd3fffa23bc382320f13fc 100644 (file)
@@ -24,6 +24,9 @@ int current_skill;
 cvar_t sv_cheats = {0, "sv_cheats", "0", "enables cheat commands in any game, and cheat impulses in dpmod"};
 cvar_t rcon_password = {0, "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)"};
+cvar_t skin = {CVAR_USERINFO | CVAR_SAVE, "skin", "", "QW player skin name (example: base)"};
+cvar_t noaim = {CVAR_USERINFO | CVAR_SAVE, "noaim", "1", "QW option to disable vertical autoaim"};
 qboolean allowcheats = false;
 
 /*
@@ -271,19 +274,35 @@ void Host_Map_f (void)
        CL_Disconnect ();
        Host_ShutdownServer();
 
-       // remove console or menu
+       // remove menu
        key_dest = key_game;
-       key_consoleactive = 0;
 
        svs.serverflags = 0;                    // haven't completed an episode yet
        allowcheats = sv_cheats.integer != 0;
        strcpy(level, Cmd_Argv(1));
        SV_SpawnServer(level);
        if (sv.active && cls.state == ca_disconnected)
-       {
-               SV_VM_Begin();
                CL_EstablishConnection("local:1");
-               SV_VM_End();
+
+// if cl_autodemo is set, automatically start recording a demo if one isn't being recorded already
+       if (cl_autodemo.integer && !cls.demorecording)
+       {
+               char demofile[MAX_OSPATH];
+
+               dpsnprintf (demofile, sizeof(demofile), "%s_%s.dem", Sys_TimeString (cl_autodemo_nameformat.string), level);
+
+               Con_Printf ("Recording to %s.\n", demofile);
+
+               cls.demofile = FS_Open (demofile, "wb", false, false);
+               if (cls.demofile)
+               {
+                       cls.forcetrack = -1;
+                       FS_Printf (cls.demofile, "%i\n", cls.forcetrack);
+               }
+               else
+                       Con_Print ("ERROR: couldn't open.\n");
+
+               cls.demorecording = true;
        }
 }
 
@@ -303,11 +322,6 @@ void Host_Changelevel_f (void)
                Con_Print("changelevel <levelname> : continue game on a new level\n");
                return;
        }
-       if (cls.demoplayback)
-       {
-               Con_Print("Only the server may changelevel\n");
-               return;
-       }
        // HACKHACKHACK
        if (!sv.active) {
                Host_Map_f();
@@ -316,9 +330,8 @@ void Host_Changelevel_f (void)
        if (cmd_source != src_command)
                return;
 
-       // remove console or menu
+       // remove menu
        key_dest = key_game;
-       key_consoleactive = 0;
 
        SV_VM_Begin();
        SV_SaveSpawnparms ();
@@ -327,11 +340,7 @@ void Host_Changelevel_f (void)
        strcpy(level, Cmd_Argv(1));
        SV_SpawnServer(level);
        if (sv.active && cls.state == ca_disconnected)
-       {
-               SV_VM_Begin();
                CL_EstablishConnection("local:1");
-               SV_VM_End();
-       }
 }
 
 /*
@@ -358,19 +367,14 @@ void Host_Restart_f (void)
        if (cmd_source != src_command)
                return;
 
-       // remove console or menu
+       // remove menu
        key_dest = key_game;
-       key_consoleactive = 0;
 
        allowcheats = sv_cheats.integer != 0;
        strcpy(mapname, sv.name);
        SV_SpawnServer(mapname);
        if (sv.active && cls.state == ca_disconnected)
-       {
-               SV_VM_Begin();
                CL_EstablishConnection("local:1");
-               SV_VM_End();
-       }
 }
 
 /*
@@ -383,22 +387,48 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
-       if (cmd_source == src_command)
-       {
-               Con_Print("reconnect is not valid from the console\n");
-               return;
-       }
-       if (Cmd_Argc() != 1)
+       if (cls.protocol == PROTOCOL_QUAKEWORLD)
        {
-               Con_Print("reconnect : wait for signon messages again\n");
-               return;
+               if (cls.qw_downloadmemory)  // don't change when downloading
+                       return;
+
+               S_StopAllSounds();
+
+               if (cls.netcon)
+               {
+                       if (cls.state == ca_connected && cls.signon < SIGNONS)
+                       {
+                               Con_Printf("reconnecting...\n");
+                               MSG_WriteChar(&cls.netcon->message, qw_clc_stringcmd);
+                               MSG_WriteString(&cls.netcon->message, "new");
+                       }
+                       else
+                       {
+                               char temp[128];
+                               // if we have connected to a server recently, the userinfo
+                               // will still contain its IP address, so get the address...
+                               InfoString_GetValue(cls.userinfo, "*ip", temp, sizeof(temp));
+                               if (temp[0])
+                                       CL_EstablishConnection(temp);
+                               else
+                                       Con_Printf("Reconnect to what server?  (you have not connected to a server yet)\n");
+                       }
+               }
        }
-       if (!cls.signon)
+       else
        {
-               //Con_Print("reconnect: no signon, ignoring reconnect\n");
-               return;
+               if (Cmd_Argc() != 1)
+               {
+                       Con_Print("reconnect : wait for signon messages again\n");
+                       return;
+               }
+               if (!cls.signon)
+               {
+                       Con_Print("reconnect: no signon, ignoring reconnect\n");
+                       return;
+               }
+               cls.signon = 0;         // need new connection messages
        }
-       cls.signon = 0;         // need new connection messages
 }
 
 /*
@@ -415,13 +445,7 @@ void Host_Connect_f (void)
                Con_Print("connect <serveraddress> : connect to a multiplayer game\n");
                return;
        }
-       if( sv.active ) {
-               SV_VM_Begin();
-               CL_EstablishConnection(Cmd_Argv(1));
-               SV_VM_End();
-       } else {
-               CL_EstablishConnection(Cmd_Argv(1));
-       }
+       CL_EstablishConnection(Cmd_Argv(1));
 }
 
 
@@ -730,6 +754,7 @@ void Host_Loadgame_f (void)
 
                entnum++;
        }
+       Mem_Free(text);
 
        prog->num_edicts = entnum;
        sv.time = time;
@@ -737,11 +762,11 @@ void Host_Loadgame_f (void)
        for (i = 0;i < NUM_SPAWN_PARMS;i++)
                svs.clients[0].spawn_parms[i] = spawn_parms[i];
 
+       SV_VM_End();
+
        // make sure we're connected to loopback
        if (cls.state == ca_disconnected || !(cls.state == ca_connected && cls.netcon != NULL && LHNETADDRESS_GetAddressType(&cls.netcon->peeraddress) == LHNETADDRESSTYPE_LOOP))
                CL_EstablishConnection("local:1");
-
-       SV_VM_End();
 }
 
 //============================================================================
@@ -776,8 +801,7 @@ void Host_Name_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_name", newName);
-               if (cls.state == ca_connected)
-                       Cmd_ForwardToServer ();
+               CL_SetInfo("name", newName, true, false, false, false);
                return;
        }
 
@@ -790,7 +814,6 @@ void Host_Name_f (void)
        host_client->nametime = sv.time + 5;
 
        // point the string back at updateclient->name to keep it safe
-       SV_VM_Begin();
        strlcpy (host_client->name, newName, sizeof (host_client->name));
        host_client->edict->fields.server->netname = PRVM_SetEngineString(host_client->name);
        if (strcmp(host_client->old_name, host_client->name))
@@ -803,7 +826,6 @@ void Host_Name_f (void)
                MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
                MSG_WriteString (&sv.reliable_datagram, host_client->name);
        }
-       SV_VM_End();
 }
 
 /*
@@ -837,8 +859,7 @@ void Host_Playermodel_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_playermodel", newPath);
-               if (cls.state == ca_connected)
-                       Cmd_ForwardToServer ();
+               CL_SetInfo("playermodel", newPath, true, false, false, false);
                return;
        }
 
@@ -852,7 +873,6 @@ void Host_Playermodel_f (void)
        host_client->nametime = sv.time + 5;
        */
 
-       SV_VM_Begin();
        // point the string back at updateclient->name to keep it safe
        strlcpy (host_client->playermodel, newPath, sizeof (host_client->playermodel));
        if( eval_playermodel )
@@ -865,7 +885,6 @@ void Host_Playermodel_f (void)
                MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
                MSG_WriteString (&sv.reliable_datagram, host_client->playermodel);*/
        }
-       SV_VM_End();
 }
 
 /*
@@ -898,8 +917,7 @@ void Host_Playerskin_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_playerskin", newPath);
-               if (cls.state == ca_connected)
-                       Cmd_ForwardToServer ();
+               CL_SetInfo("playermodel", newPath, true, false, false, false);
                return;
        }
 
@@ -913,7 +931,6 @@ void Host_Playerskin_f (void)
        host_client->nametime = sv.time + 5;
        */
 
-       SV_VM_Begin();
        // point the string back at updateclient->name to keep it safe
        strlcpy (host_client->playerskin, newPath, sizeof (host_client->playerskin));
        if( eval_playerskin )
@@ -928,7 +945,6 @@ void Host_Playerskin_f (void)
                MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
                MSG_WriteString (&sv.reliable_datagram, host_client->playerskin);*/
        }
-       SV_VM_End();
 }
 
 void Host_Version_f (void)
@@ -966,7 +982,6 @@ void Host_Say(qboolean teamonly)
        if (!teamplay.integer)
                teamonly = false;
 
-// turn on color set 1
        p1 = Cmd_Args();
        quoted = false;
        if (*p1 == '\"')
@@ -974,10 +989,11 @@ void Host_Say(qboolean teamonly)
                quoted = true;
                p1++;
        }
+       // note this uses the chat prefix \001
        if (!fromServer)
-               dpsnprintf (text, sizeof(text), "%c%s" STRING_COLOR_DEFAULT_STR ": %s", 1, host_client->name, p1);
+               dpsnprintf (text, sizeof(text), "\001%s" STRING_COLOR_DEFAULT_STR ": %s", host_client->name, p1);
        else
-               dpsnprintf (text, sizeof(text), "%c<%s" STRING_COLOR_DEFAULT_STR "> %s", 1, hostname.string, p1);
+               dpsnprintf (text, sizeof(text), "\001<%s" STRING_COLOR_DEFAULT_STR "> %s", hostname.string, p1);
        p2 = text + strlen(text);
        while ((const char *)p2 > (const char *)text && (p2[-1] == '\r' || p2[-1] == '\n' || (p2[-1] == '\"' && quoted)))
        {
@@ -1034,10 +1050,11 @@ void Host_Tell_f(void)
        if (Cmd_Argc () < 3)
                return;
 
+       // note this uses the chat prefix \001
        if (!fromServer)
-               sprintf (text, "%s: ", host_client->name);
+               sprintf (text, "\001%s tells you: ", host_client->name);
        else
-               sprintf (text, "<%s> ", hostname.string);
+               sprintf (text, "\001<%s tells you> ", hostname.string);
 
        p1 = Cmd_Args();
        p2 = p1 + strlen(p1);
@@ -1081,48 +1098,45 @@ Host_Color_f
 ==================
 */
 cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0", "internal storage cvar for current player colors (changed by color command)"};
-void Host_Color_f(void)
+void Host_Color(int changetop, int changebottom)
 {
-       int             top, bottom;
-       int             playercolor;
+       int top, bottom, playercolor;
        mfunction_t *f;
-       func_t  SV_ChangeTeam;
+       func_t SV_ChangeTeam;
 
-       if (Cmd_Argc() == 1)
-       {
-               Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
-               Con_Print("color <0-15> [0-15]\n");
-               return;
-       }
-
-       if (Cmd_Argc() == 2)
-               top = bottom = atoi(Cmd_Argv(1));
-       else
-       {
-               top = atoi(Cmd_Argv(1));
-               bottom = atoi(Cmd_Argv(2));
-       }
+       // get top and bottom either from the provided values or the current values
+       // (allows changing only top or bottom, or both at once)
+       top = changetop >= 0 ? changetop : (cl_color.integer >> 4);
+       bottom = changebottom >= 0 ? changebottom : cl_color.integer;
 
        top &= 15;
-       // LordHavoc: allow skin colormaps 14 and 15 (was 13)
-       if (top > 15)
-               top = 15;
        bottom &= 15;
-       // LordHavoc: allow skin colormaps 14 and 15 (was 13)
-       if (bottom > 15)
-               bottom = 15;
+       // LordHavoc: allowing skin colormaps 14 and 15 by commenting this out
+       //if (top > 13)
+       //      top = 13;
+       //if (bottom > 13)
+       //      bottom = 13;
 
        playercolor = top*16 + bottom;
 
        if (cmd_source == src_command)
        {
-               Cvar_SetValue ("_cl_color", playercolor);
-               if (cls.state == ca_connected)
-                       Cmd_ForwardToServer ();
+               Cvar_SetValueQuick(&cl_color, playercolor);
+               if (changetop >= 0)
+                       CL_SetInfo("topcolor", va("%i", top), true, false, false, false);
+               if (changebottom >= 0)
+                       CL_SetInfo("bottomcolor", va("%i", bottom), true, false, false, false);
+               if (cls.protocol != PROTOCOL_QUAKEWORLD)
+               {
+                       MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+                       MSG_WriteString(&cls.netcon->message, va("color %i %i", top, bottom));
+               }
                return;
        }
 
-       SV_VM_Begin();
+       if (cls.protocol == PROTOCOL_QUAKEWORLD)
+               return;
+
        if (host_client->edict && (f = PRVM_ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - prog->functions)))
        {
                Con_DPrint("Calling SV_ChangeTeam\n");
@@ -1150,7 +1164,51 @@ void Host_Color_f(void)
                        MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
                }
        }
-       SV_VM_End();
+}
+
+void Host_Color_f(void)
+{
+       int             top, bottom;
+
+       if (Cmd_Argc() == 1)
+       {
+               Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
+               Con_Print("color <0-15> [0-15]\n");
+               return;
+       }
+
+       if (Cmd_Argc() == 2)
+               top = bottom = atoi(Cmd_Argv(1));
+       else
+       {
+               top = atoi(Cmd_Argv(1));
+               bottom = atoi(Cmd_Argv(2));
+       }
+       Host_Color(top, bottom);
+}
+
+void Host_TopColor_f(void)
+{
+       if (Cmd_Argc() == 1)
+       {
+               Con_Printf("\"topcolor\" is \"%i\"\n", cl_color.integer >> 4);
+               Con_Print("topcolor <0-15>\n");
+               return;
+       }
+
+       Host_Color(atoi(Cmd_Argv(1)), -1);
+}
+
+void Host_BottomColor_f(void)
+{
+       if (Cmd_Argc() == 1)
+       {
+               Con_Printf("\"bottomcolor\" is \"%i\"\n", cl_color.integer);
+               Con_Print("bottomcolor <0-15>\n");
+               return;
+       }
+
+       Host_Color(-1, atoi(Cmd_Argv(1)));
 }
 
 cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000", "internal storage cvar for current rate (changed by rate command)"};
@@ -1170,8 +1228,7 @@ void Host_Rate_f(void)
        if (cmd_source == src_command)
        {
                Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE));
-               if (cls.state == ca_connected)
-                       Cmd_ForwardToServer ();
+               CL_SetInfo("rate", va("%i", rate), true, false, false, false);
                return;
        }
 
@@ -1197,11 +1254,9 @@ void Host_Kill_f (void)
                return;
        }
 
-       SV_VM_Begin();
        prog->globals.server->time = sv.time;
        prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
        PRVM_ExecuteProgram (prog->globals.server->ClientKill, "QC function ClientKill is missing");
-       SV_VM_End();
 }
 
 
@@ -1260,10 +1315,8 @@ static void Host_PModel_f (void)
                return;
        }
 
-       SV_VM_Begin();
        if (host_client->edict && (val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
                val->_float = i;
-       SV_VM_End();
 }
 
 //===========================================================================
@@ -1334,7 +1387,6 @@ void Host_Spawn_f (void)
        //      SZ_Clear (&host_client->netconnection->message);
 
        // run the entrance script
-       SV_VM_Begin();
        if (sv.loadgame)
        {
                // loaded games are fully initialized already
@@ -1369,12 +1421,10 @@ void Host_Spawn_f (void)
 
                PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing");
        }
-       SV_VM_End();
 
        if (!host_client->netconnection)
                return;
 
-       SV_VM_Begin();
        // send time of update
        MSG_WriteByte (&host_client->netconnection->message, svc_time);
        MSG_WriteFloat (&host_client->netconnection->message, sv.time);
@@ -1409,35 +1459,45 @@ void Host_Spawn_f (void)
        // send some stats
        MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
        MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALSECRETS);
-       MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->total_secrets);
+       MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_secrets);
 
        MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
        MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALMONSTERS);
-       MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->total_monsters);
+       MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_monsters);
 
        MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
        MSG_WriteByte (&host_client->netconnection->message, STAT_SECRETS);
-       MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->found_secrets);
+       MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->found_secrets);
 
        MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
        MSG_WriteByte (&host_client->netconnection->message, STAT_MONSTERS);
-       MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->killed_monsters);
+       MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->killed_monsters);
 
        // send a fixangle
        // Never send a roll angle, because savegames can catch the server
        // in a state where it is expecting the client to correct the angle
        // and it won't happen if the game was just loaded, so you wind up
        // with a permanent head tilt
-       MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
-       MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[0], sv.protocol);
-       MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[1], sv.protocol);
-       MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+       if (sv.loadgame)
+       {
+               MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
+               MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->v_angle[0], sv.protocol);
+               MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->v_angle[1], sv.protocol);
+               MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+               sv.loadgame = false; // we're basically done with loading now
+       }
+       else
+       {
+               MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
+               MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[0], sv.protocol);
+               MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[1], sv.protocol);
+               MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+       }
 
        SV_WriteClientdataToMessage (host_client, host_client->edict, &host_client->netconnection->message, stats);
 
        MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
        MSG_WriteByte (&host_client->netconnection->message, 3);
-       SV_VM_End();
 }
 
 /*
@@ -1482,7 +1542,7 @@ void Host_Kick_f (void)
 
        if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0)
        {
-               i = atof(Cmd_Argv(2)) - 1;
+               i = (int)(atof(Cmd_Argv(2)) - 1);
                if (i < 0 || i >= svs.maxclients || !(host_client = svs.clients + i)->active)
                        return;
                byNumber = true;
@@ -1573,7 +1633,6 @@ void Host_Give_f (void)
        t = Cmd_Argv(1);
        v = atoi (Cmd_Argv(2));
 
-       SV_VM_Begin();
        switch (t[0])
        {
        case '0':
@@ -1703,7 +1762,6 @@ void Host_Give_f (void)
                }
                break;
        }
-       SV_VM_End();
 }
 
 prvm_edict_t   *FindViewthing (void)
@@ -1812,7 +1870,7 @@ void Host_Viewnext_f (void)
        if (e->fields.server->frame >= m->numframes)
                e->fields.server->frame = m->numframes - 1;
 
-       PrintFrameName (m, e->fields.server->frame);
+       PrintFrameName (m, (int)e->fields.server->frame);
 }
 
 /*
@@ -1840,7 +1898,7 @@ void Host_Viewprev_f (void)
        if (e->fields.server->frame < 0)
                e->fields.server->frame = 0;
 
-       PrintFrameName (m, e->fields.server->frame);
+       PrintFrameName (m, (int)e->fields.server->frame);
 }
 
 /*
@@ -1984,20 +2042,6 @@ static void MaxPlayers_f(void)
 
 // QuakeWorld commands
 
-char emodel_name[] =
-       { 'e' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
-char pmodel_name[] =
-       { 'p' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
-char prespawn_name[] =
-       { 'p'^0xff, 'r'^0xff, 'e'^0xff, 's'^0xff, 'p'^0xff, 'a'^0xff, 'w'^0xff, 'n'^0xff,
-               ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '0'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-char modellist_name[] =
-       { 'm'^0xff, 'o'^0xff, 'd'^0xff, 'e'^0xff, 'l'^0xff, 'l'^0xff, 'i'^0xff, 's'^0xff, 't'^0xff,
-               ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-char soundlist_name[] =
-       { 's'^0xff, 'o'^0xff, 'u'^0xff, 'n'^0xff, 'd'^0xff, 'l'^0xff, 'i'^0xff, 's'^0xff, 't'^0xff,
-               ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-
 /*
 =====================
 Host_Rcon_f
@@ -2008,15 +2052,25 @@ Host_Rcon_f
 */
 void Host_Rcon_f (void) // credit: taken from QuakeWorld
 {
+       int i;
        lhnetaddress_t to;
        lhnetsocket_t *mysocket;
 
-       if (!rcon_password.string)
+       if (!rcon_password.string || !rcon_password.string[0])
        {
                Con_Printf ("You must set rcon_password before issuing an rcon command.\n");
                return;
        }
 
+       for (i = 0;rcon_password.string[i];i++)
+       {
+               if (rcon_password.string[i] <= ' ')
+               {
+                       Con_Printf("rcon_password is not allowed to have any whitespace.\n");
+                       return;
+               }
+       }
+
        if (cls.netcon)
                to = cls.netcon->peeraddress;
        else
@@ -2036,6 +2090,162 @@ void Host_Rcon_f (void) // credit: taken from QuakeWorld
        }
 }
 
+/*
+====================
+Host_User_f
+
+user <name or userid>
+
+Dump userdata / masterdata for a user
+====================
+*/
+void Host_User_f (void) // credit: taken from QuakeWorld
+{
+       int             uid;
+       int             i;
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf ("Usage: user <username / userid>\n");
+               return;
+       }
+
+       uid = atoi(Cmd_Argv(1));
+
+       for (i = 0;i < cl.maxclients;i++)
+       {
+               if (!cl.scores[i].name[0])
+                       continue;
+               if (cl.scores[i].qw_userid == uid || !strcasecmp(cl.scores[i].name, Cmd_Argv(1)))
+               {
+                       InfoString_Print(cl.scores[i].qw_userinfo);
+                       return;
+               }
+       }
+       Con_Printf ("User not in server.\n");
+}
+
+/*
+====================
+Host_Users_f
+
+Dump userids for all current players
+====================
+*/
+void Host_Users_f (void) // credit: taken from QuakeWorld
+{
+       int             i;
+       int             c;
+
+       c = 0;
+       Con_Printf ("userid frags name\n");
+       Con_Printf ("------ ----- ----\n");
+       for (i = 0;i < cl.maxclients;i++)
+       {
+               if (cl.scores[i].name[0])
+               {
+                       Con_Printf ("%6i %4i %s\n", cl.scores[i].qw_userid, cl.scores[i].frags, cl.scores[i].name);
+                       c++;
+               }
+       }
+
+       Con_Printf ("%i total users\n", c);
+}
+
+/*
+==================
+Host_FullServerinfo_f
+
+Sent by server when serverinfo changes
+==================
+*/
+// TODO: shouldn't this be a cvar instead?
+void Host_FullServerinfo_f (void) // credit: taken from QuakeWorld
+{
+       char temp[512];
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf ("usage: fullserverinfo <complete info string>\n");
+               return;
+       }
+
+       strlcpy (cl.qw_serverinfo, Cmd_Argv(1), sizeof(cl.qw_serverinfo));
+       InfoString_GetValue(cl.qw_serverinfo, "teamplay", temp, sizeof(temp));
+       cl.qw_teamplay = atoi(temp);
+}
+
+/*
+==================
+Host_FullInfo_f
+
+Allow clients to change userinfo
+==================
+Casey was here :)
+*/
+void Host_FullInfo_f (void) // credit: taken from QuakeWorld
+{
+       char key[512];
+       char value[512];
+       char *o;
+       const char *s;
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf ("fullinfo <complete info string>\n");
+               return;
+       }
+
+       s = Cmd_Argv(1);
+       if (*s == '\\')
+               s++;
+       while (*s)
+       {
+               o = key;
+               while (*s && *s != '\\')
+                       *o++ = *s++;
+               *o = 0;
+
+               if (!*s)
+               {
+                       Con_Printf ("MISSING VALUE\n");
+                       return;
+               }
+
+               o = value;
+               s++;
+               while (*s && *s != '\\')
+                       *o++ = *s++;
+               *o = 0;
+
+               if (*s)
+                       s++;
+
+               CL_SetInfo(key, value, false, false, false, false);
+       }
+}
+
+/*
+==================
+CL_SetInfo_f
+
+Allow clients to change userinfo
+==================
+*/
+void Host_SetInfo_f (void) // credit: taken from QuakeWorld
+{
+       if (Cmd_Argc() == 1)
+       {
+               InfoString_Print(cls.userinfo);
+               return;
+       }
+       if (Cmd_Argc() != 3)
+       {
+               Con_Printf ("usage: setinfo [ <key> <value> ]\n");
+               return;
+       }
+       CL_SetInfo(Cmd_Argv(1), Cmd_Argv(2), true, false, false, false);
+}
+
 /*
 ====================
 Host_Packet_f
@@ -2070,7 +2280,7 @@ void Host_Packet_f (void) // credit: taken from QuakeWorld
        out = send+4;
        send[0] = send[1] = send[2] = send[3] = 0xff;
 
-       l = strlen (in);
+       l = (int)strlen (in);
        for (i=0 ; i<l ; i++)
        {
                if (out >= send + sizeof(send) - 1)
@@ -2080,14 +2290,33 @@ void Host_Packet_f (void) // credit: taken from QuakeWorld
                        *out++ = '\n';
                        i++;
                }
+               else if (in[i] == '\\' && in[i+1] == '0')
+               {
+                       *out++ = '\0';
+                       i++;
+               }
+               else if (in[i] == '\\' && in[i+1] == 't')
+               {
+                       *out++ = '\t';
+                       i++;
+               }
+               else if (in[i] == '\\' && in[i+1] == 'r')
+               {
+                       *out++ = '\r';
+                       i++;
+               }
+               else if (in[i] == '\\' && in[i+1] == '"')
+               {
+                       *out++ = '\"';
+                       i++;
+               }
                else
                        *out++ = in[i];
        }
-       *out = 0;
 
        mysocket = NetConn_ChooseClientSocketForAddress(&address);
        if (mysocket)
-               NetConn_WriteString(mysocket, send, &address);
+               NetConn_Write(mysocket, send, out - send, &address);
 }
 
 //=============================================================================
@@ -2099,6 +2328,8 @@ Host_InitCommands
 */
 void Host_InitCommands (void)
 {
+       dpsnprintf(cls.userinfo, sizeof(cls.userinfo), "\\name\\player\\team\\none\\topcolor\\0\\bottomcolor\\0\\rate\\10000\\msg\\1\\noaim\\1\\*ver\\%s", engineversion);
+
        Cmd_AddCommand ("status", Host_Status_f, "print server status information");
        Cmd_AddCommand ("quit", Host_Quit_f, "quit the game");
        if (gamemode == GAME_NEHAHRA)
@@ -2170,7 +2401,18 @@ void Host_InitCommands (void)
        Cvar_RegisterVariable (&rcon_password);
        Cvar_RegisterVariable (&rcon_address);
        Cmd_AddCommand ("rcon", Host_Rcon_f, "sends a command to the server console (if your rcon_password matches the server's rcon_password), or to the address specified by rcon_address when not connected (again rcon_password must match the server's)");
+       Cmd_AddCommand ("user", Host_User_f, "prints additional information about a player number or name on the scoreboard");
+       Cmd_AddCommand ("users", Host_Users_f, "prints additional information about all players on the scoreboard");
+       Cmd_AddCommand ("fullserverinfo", Host_FullServerinfo_f, "internal use only, sent by server to client to update client's local copy of serverinfo string");
+       Cmd_AddCommand ("fullinfo", Host_FullInfo_f, "allows client to modify their userinfo");
+       Cmd_AddCommand ("setinfo", Host_SetInfo_f, "modifies your userinfo");
        Cmd_AddCommand ("packet", Host_Packet_f, "send a packet to the specified address:port containing a text string");
+       Cmd_AddCommand ("topcolor", Host_TopColor_f, "QW command to set top color without changing bottom color");
+       Cmd_AddCommand ("bottomcolor", Host_BottomColor_f, "QW command to set bottom color without changing top color");
+
+       Cvar_RegisterVariable (&team);
+       Cvar_RegisterVariable (&skin);
+       Cvar_RegisterVariable (&noaim);
 
        Cvar_RegisterVariable(&sv_cheats);
 }