]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - host_cmd.c
renamed varray_ arrays to rsurface_array_, and they are no longer used outside the...
[xonotic/darkplaces.git] / host_cmd.c
index 654abb553bdeee0015e6074cfa55f0a4b7f583be..9bd58db01dec59540b4940a99657b89ab775d5a4 100644 (file)
@@ -21,7 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 int current_skill;
-cvar_t sv_cheats = {0, "sv_cheats", "0"};
+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)"};
 qboolean allowcheats = false;
 
 /*
@@ -209,21 +211,28 @@ Host_Ping_f
 */
 void Host_Ping_f (void)
 {
-       int             i;
-       client_t        *client;
+       int i;
+       client_t *client;
+       void (*print) (const char *fmt, ...);
 
        if (cmd_source == src_command)
        {
-               Cmd_ForwardToServer ();
-               return;
+               if (!sv.active)
+               {
+                       Cmd_ForwardToServer ();
+                       return;
+               }
+               print = Con_Printf;
        }
+       else
+               print = SV_ClientPrintf;
 
-       SV_ClientPrint("Client ping times:\n");
+       print("Client ping times:\n");
        for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
        {
                if (!client->active)
                        continue;
-               SV_ClientPrintf("%4i %s\n", (int)(client->ping*1000), client->name);
+               print("%4i %s\n", (int)floor(client->ping*1000+0.5), client->name);
        }
 }
 
@@ -260,7 +269,7 @@ void Host_Map_f (void)
        cls.demonum = -1;               // stop demo loop in case this fails
 
        CL_Disconnect ();
-       Host_ShutdownServer(false);
+       Host_ShutdownServer();
 
        // remove console or menu
        key_dest = key_game;
@@ -271,11 +280,7 @@ void Host_Map_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();
-       }
 }
 
 /*
@@ -294,11 +299,16 @@ void Host_Changelevel_f (void)
                Con_Print("changelevel <levelname> : continue game on a new level\n");
                return;
        }
-       if (!sv.active || cls.demoplayback)
+       if (cls.demoplayback)
        {
                Con_Print("Only the server may changelevel\n");
                return;
        }
+       // HACKHACKHACK
+       if (!sv.active) {
+               Host_Map_f();
+               return;
+       }
        if (cmd_source != src_command)
                return;
 
@@ -313,11 +323,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();
-       }
 }
 
 /*
@@ -336,7 +342,7 @@ void Host_Restart_f (void)
                Con_Print("restart : restart current level\n");
                return;
        }
-       if (!sv.active || cls.demoplayback)
+       if (!sv.active)
        {
                Con_Print("Only the server may restart\n");
                return;
@@ -352,11 +358,7 @@ void Host_Restart_f (void)
        strcpy(mapname, sv.name);
        SV_SpawnServer(mapname);
        if (sv.active && cls.state == ca_disconnected)
-       {
-               SV_VM_Begin();
                CL_EstablishConnection("local:1");
-               SV_VM_End();
-       }
 }
 
 /*
@@ -369,17 +371,39 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
-       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
+                               Con_Printf("Please use connect instead (reconnect not implemented)\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
 }
 
 /*
@@ -396,13 +420,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));
 }
 
 
@@ -430,12 +448,14 @@ void Host_SavegameComment (char *text)
 
        for (i=0 ; i<SAVEGAME_COMMENT_LENGTH ; i++)
                text[i] = ' ';
-       memcpy (text, cl.levelname, strlen(cl.levelname));
+       // LordHavoc: added min() to prevent overflow
+       memcpy (text, cl.levelname, min(strlen(cl.levelname), SAVEGAME_COMMENT_LENGTH));
        sprintf (kills,"kills:%3i/%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]);
        memcpy (text+22, kills, strlen(kills));
-// convert space to _ to make stdio happy
+       // convert space to _ to make stdio happy
+       // LordHavoc: convert control characters to _ as well
        for (i=0 ; i<SAVEGAME_COMMENT_LENGTH ; i++)
-               if (text[i] == ' ')
+               if (text[i] <= ' ')
                        text[i] = '_';
        text[SAVEGAME_COMMENT_LENGTH] = '\0';
 }
@@ -448,7 +468,7 @@ Host_Savegame_f
 */
 void Host_Savegame_f (void)
 {
-       char    name[256];
+       char    name[MAX_QPATH];
        qfile_t *f;
        int             i;
        char    comment[SAVEGAME_COMMENT_LENGTH+1];
@@ -551,6 +571,7 @@ void Host_Loadgame_f (void)
        float time;
        const char *start;
        const char *t;
+       const char *oldt;
        char *text;
        prvm_edict_t *ent;
        int i;
@@ -574,7 +595,7 @@ void Host_Loadgame_f (void)
 
        cls.demonum = -1;               // stop demo loop in case this fails
 
-       t = text = FS_LoadFile (filename, tempmempool, false);
+       t = text = (char *)FS_LoadFile (filename, tempmempool, false, NULL);
        if (!text)
        {
                Con_Print("ERROR: couldn't open.\n");
@@ -632,10 +653,33 @@ void Host_Loadgame_f (void)
        for (i = 0;i < MAX_LIGHTSTYLES;i++)
        {
                // light style
+               oldt = t;
                COM_ParseToken(&t, false);
+               // if this is a 64 lightstyle savegame produced by Quake, stop now
+               // we have to check this because darkplaces saves 256 lightstyle savegames
+               if (com_token[0] == '{')
+               {
+                       t = oldt;
+                       break;
+               }
                strlcpy(sv.lightstyles[i], com_token, sizeof(sv.lightstyles[i]));
        }
 
+       // now skip everything before the first opening brace
+       // (this is for forward compatibility, so that older versions (at
+       // least ones with this fix) can load savegames with extra data before the
+       // first brace, as might be produced by a later engine version)
+       for(;;)
+       {
+               oldt = t;
+               COM_ParseToken(&t, false);
+               if (com_token[0] == '{')
+               {
+                       t = oldt;
+                       break;
+               }
+       }
+
 // load the edicts out of the savegame file
        SV_VM_Begin();
        // -1 is the globals
@@ -668,7 +712,7 @@ void Host_Loadgame_f (void)
                        if (entnum >= MAX_EDICTS)
                        {
                                Mem_Free(text);
-                               Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)\n", MAX_EDICTS);
+                               Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)", MAX_EDICTS);
                        }
                        while (entnum >= prog->max_edicts)
                                //SV_IncreaseEdicts();
@@ -685,6 +729,7 @@ void Host_Loadgame_f (void)
 
                entnum++;
        }
+       Mem_Free(text);
 
        prog->num_edicts = entnum;
        sv.time = time;
@@ -692,11 +737,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();
 }
 
 //============================================================================
@@ -706,7 +751,7 @@ void Host_Loadgame_f (void)
 Host_Name_f
 ======================
 */
-cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"};
+cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player", "internal storage cvar for current player name (changed by name command)"};
 void Host_Name_f (void)
 {
        int i, j;
@@ -731,6 +776,7 @@ void Host_Name_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_name", newName);
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "name", newName);
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
@@ -764,7 +810,7 @@ void Host_Name_f (void)
 Host_Playermodel_f
 ======================
 */
-cvar_t cl_playermodel = {CVAR_SAVE, "_cl_playermodel", ""};
+cvar_t cl_playermodel = {CVAR_SAVE, "_cl_playermodel", "", "internal storage cvar for current player model in Nexuiz (changed by playermodel command)"};
 // the old cl_playermodel in cl_main has been renamed to __cl_playermodel
 void Host_Playermodel_f (void)
 {
@@ -790,6 +836,7 @@ void Host_Playermodel_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_playermodel", newPath);
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "playermodel", newPath);
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
@@ -811,8 +858,6 @@ void Host_Playermodel_f (void)
                PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PRVM_SetEngineString(host_client->playermodel);
        if (strcmp(host_client->old_model, host_client->playermodel))
        {
-               if (host_client->spawned)
-                       SV_BroadcastPrintf("%s changed model to %s\n", host_client->name, host_client->playermodel);
                strcpy(host_client->old_model, host_client->playermodel);
                /*// send notification to all clients
                MSG_WriteByte (&sv.reliable_datagram, svc_updatepmodel);
@@ -826,7 +871,7 @@ void Host_Playermodel_f (void)
 Host_Playerskin_f
 ======================
 */
-cvar_t cl_playerskin = {CVAR_SAVE, "_cl_playerskin", ""};
+cvar_t cl_playerskin = {CVAR_SAVE, "_cl_playerskin", "", "internal storage cvar for current player skin in Nexuiz (changed by playerskin command)"};
 void Host_Playerskin_f (void)
 {
        int i, j;
@@ -851,6 +896,7 @@ void Host_Playerskin_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_playerskin", newPath);
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "playerskin", newPath);
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
@@ -893,8 +939,8 @@ void Host_Say(qboolean teamonly)
        int j, quoted;
        const char *p1;
        char *p2;
-       // LordHavoc: 256 char say messages
-       unsigned char text[256];
+       // LordHavoc: long say messages
+       char text[1024];
        qboolean fromServer = false;
 
        if (cmd_source == src_command)
@@ -926,9 +972,9 @@ void Host_Say(qboolean teamonly)
                p1++;
        }
        if (!fromServer)
-               dpsnprintf (text, sizeof(text), "%c%s: %s", 1, host_client->name, p1);
+               dpsnprintf (text, sizeof(text), "%c%s" STRING_COLOR_DEFAULT_STR ": %s", 1, host_client->name, p1);
        else
-               dpsnprintf (text, sizeof(text), "%c<%s> %s", 1, hostname.string, p1);
+               dpsnprintf (text, sizeof(text), "%c<%s" STRING_COLOR_DEFAULT_STR "> %s", 1, hostname.string, p1);
        p2 = text + strlen(text);
        while ((const char *)p2 > (const char *)text && (p2[-1] == '\r' || p2[-1] == '\n' || (p2[-1] == '\"' && quoted)))
        {
@@ -968,7 +1014,7 @@ void Host_Tell_f(void)
        client_t *save;
        int j;
        const char *p1, *p2;
-       char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64)
+       char text[MAX_INPUTLINE]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64)
        qboolean fromServer = false;
 
        if (cmd_source == src_command)
@@ -1013,7 +1059,7 @@ void Host_Tell_f(void)
        }
        while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
                p2--;
-       for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
+       for (j = (int)strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
                text[j++] = *p1++;
        text[j++] = '\n';
        text[j++] = 0;
@@ -1031,7 +1077,7 @@ void Host_Tell_f(void)
 Host_Color_f
 ==================
 */
-cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0"};
+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)
 {
        int             top, bottom;
@@ -1068,11 +1114,16 @@ void Host_Color_f(void)
        if (cmd_source == src_command)
        {
                Cvar_SetValue ("_cl_color", playercolor);
-               if (cls.state == ca_connected)
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "topcolor", va("%i", top));
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "bottomcolor", va("%i", bottom));
+               if (cls.state == ca_connected && cls.protocol != PROTOCOL_QUAKEWORLD)
                        Cmd_ForwardToServer ();
                return;
        }
 
+       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");
@@ -1102,7 +1153,7 @@ void Host_Color_f(void)
        }
 }
 
-cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000"};
+cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000", "internal storage cvar for current rate (changed by rate command)"};
 void Host_Rate_f(void)
 {
        int rate;
@@ -1119,6 +1170,7 @@ void Host_Rate_f(void)
        if (cmd_source == src_command)
        {
                Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE));
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "rate", va("%i", rate));
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
@@ -1181,9 +1233,10 @@ void Host_Pause_f (void)
 ======================
 Host_PModel_f
 LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
+LordHavoc: correction, Mindcrime will be removing pmodel in the future, but it's still stuck here for compatibility.
 ======================
 */
-cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"};
+cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0", "internal storage cvar for current player model number in nehahra (changed by pmodel command)"};
 static void Host_PModel_f (void)
 {
        int i;
@@ -1232,10 +1285,12 @@ void Host_PreSpawn_f (void)
                return;
        }
 
-       SZ_Write (&host_client->message, sv.signon.data, sv.signon.cursize);
-       MSG_WriteByte (&host_client->message, svc_signonnum);
-       MSG_WriteByte (&host_client->message, 2);
-       host_client->sendsignon = true;
+       if (host_client->netconnection)
+       {
+               SZ_Write (&host_client->netconnection->message, sv.signon.data, sv.signon.cursize);
+               MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
+               MSG_WriteByte (&host_client->netconnection->message, 2);
+       }
 
        // reset the name change timer because the client will send name soon
        host_client->nametime = 0;
@@ -1271,8 +1326,9 @@ void Host_Spawn_f (void)
        host_client->nametime = 0;
 
        // LordHavoc: moved this above the QC calls at FrikaC's request
-       // send all current names, colors, and frag counts
-       SZ_Clear (&host_client->message);
+       // LordHavoc: commented this out
+       //if (host_client->netconnection)
+       //      SZ_Clear (&host_client->netconnection->message);
 
        // run the entrance script
        if (sv.loadgame)
@@ -1292,9 +1348,6 @@ void Host_Spawn_f (void)
        }
        else
        {
-               // set up the edict
-               PRVM_ED_ClearEdict(host_client->edict);
-
                //Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, host_client->edict->netname = %s, host_client->name = %s\n", PRVM_GetString(host_client->edict->fields.server->netname), PRVM_GetString(host_client->edict->fields.server->netname), host_client->name);
 
                // copy spawn parms out of the client_t
@@ -1313,66 +1366,82 @@ void Host_Spawn_f (void)
                PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing");
        }
 
+       if (!host_client->netconnection)
+               return;
 
        // send time of update
-       MSG_WriteByte (&host_client->message, svc_time);
-       MSG_WriteFloat (&host_client->message, sv.time);
+       MSG_WriteByte (&host_client->netconnection->message, svc_time);
+       MSG_WriteFloat (&host_client->netconnection->message, sv.time);
 
+       // send all current names, colors, and frag counts
        for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
        {
                if (!client->active)
                        continue;
-               MSG_WriteByte (&host_client->message, svc_updatename);
-               MSG_WriteByte (&host_client->message, i);
-               MSG_WriteString (&host_client->message, client->name);
-               MSG_WriteByte (&host_client->message, svc_updatefrags);
-               MSG_WriteByte (&host_client->message, i);
-               MSG_WriteShort (&host_client->message, client->frags);
-               MSG_WriteByte (&host_client->message, svc_updatecolors);
-               MSG_WriteByte (&host_client->message, i);
-               MSG_WriteByte (&host_client->message, client->colors);
+               MSG_WriteByte (&host_client->netconnection->message, svc_updatename);
+               MSG_WriteByte (&host_client->netconnection->message, i);
+               MSG_WriteString (&host_client->netconnection->message, client->name);
+               MSG_WriteByte (&host_client->netconnection->message, svc_updatefrags);
+               MSG_WriteByte (&host_client->netconnection->message, i);
+               MSG_WriteShort (&host_client->netconnection->message, client->frags);
+               MSG_WriteByte (&host_client->netconnection->message, svc_updatecolors);
+               MSG_WriteByte (&host_client->netconnection->message, i);
+               MSG_WriteByte (&host_client->netconnection->message, client->colors);
        }
 
        // send all current light styles
        for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
        {
-               MSG_WriteByte (&host_client->message, svc_lightstyle);
-               MSG_WriteByte (&host_client->message, (char)i);
-               MSG_WriteString (&host_client->message, sv.lightstyles[i]);
+               if (sv.lightstyles[i][0])
+               {
+                       MSG_WriteByte (&host_client->netconnection->message, svc_lightstyle);
+                       MSG_WriteByte (&host_client->netconnection->message, (char)i);
+                       MSG_WriteString (&host_client->netconnection->message, sv.lightstyles[i]);
+               }
        }
 
        // send some stats
-       MSG_WriteByte (&host_client->message, svc_updatestat);
-       MSG_WriteByte (&host_client->message, STAT_TOTALSECRETS);
-       MSG_WriteLong (&host_client->message, prog->globals.server->total_secrets);
+       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_WriteByte (&host_client->message, svc_updatestat);
-       MSG_WriteByte (&host_client->message, STAT_TOTALMONSTERS);
-       MSG_WriteLong (&host_client->message, prog->globals.server->total_monsters);
+       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_WriteByte (&host_client->message, svc_updatestat);
-       MSG_WriteByte (&host_client->message, STAT_SECRETS);
-       MSG_WriteLong (&host_client->message, prog->globals.server->found_secrets);
+       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_WriteByte (&host_client->message, svc_updatestat);
-       MSG_WriteByte (&host_client->message, STAT_MONSTERS);
-       MSG_WriteLong (&host_client->message, prog->globals.server->killed_monsters);
+       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);
 
        // 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->message, svc_setangle);
-       MSG_WriteAngle (&host_client->message, host_client->edict->fields.server->angles[0], sv.protocol);
-       MSG_WriteAngle (&host_client->message, host_client->edict->fields.server->angles[1], sv.protocol);
-       MSG_WriteAngle (&host_client->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->message, stats);
+       SV_WriteClientdataToMessage (host_client, host_client->edict, &host_client->netconnection->message, stats);
 
-       MSG_WriteByte (&host_client->message, svc_signonnum);
-       MSG_WriteByte (&host_client->message, 3);
-       host_client->sendsignon = true;
+       MSG_WriteByte (&host_client->netconnection->message, svc_signonnum);
+       MSG_WriteByte (&host_client->netconnection->message, 3);
 }
 
 /*
@@ -1674,9 +1743,9 @@ void Host_Viewmodel_f (void)
                return;
 
        m = Mod_ForName (Cmd_Argv(1), false, true, false);
-       if (!m)
+       if (!m || !m->loaded || !m->Draw)
        {
-               Con_Printf("Can't load %s\n", Cmd_Argv(1));
+               Con_Printf("viewmodel: can't load %s\n", Cmd_Argv(1));
                return;
        }
 
@@ -1794,7 +1863,7 @@ void Host_Startdemos_f (void)
 {
        int             i, c;
 
-       if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
+       if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
                return;
 
        c = Cmd_Argc() - 1;
@@ -1851,7 +1920,36 @@ void Host_Stopdemo_f (void)
        if (!cls.demoplayback)
                return;
        CL_Disconnect ();
-       Host_ShutdownServer (false);
+       Host_ShutdownServer ();
+}
+
+void Host_SendCvar_f (void)
+{
+       int             i;
+       cvar_t  *c;
+       client_t *old;
+
+       if(Cmd_Argc() != 2)
+               return;
+       if(!(c = Cvar_FindVar(Cmd_Argv(1))))
+               return;
+       if (cls.state != ca_dedicated)
+               Cmd_ForwardStringToServer(va("sentcvar %s %s\n", c->name, c->string));
+       if(!sv.active)// || !SV_ParseClientCommandQC)
+               return;
+
+       old = host_client;
+       if (cls.state != ca_dedicated)
+               i = 1;
+       else
+               i = 0;
+       for(;i<svs.maxclients;i++)
+               if(svs.clients[i].active && svs.clients[i].netconnection)
+               {
+                       host_client = &svs.clients[i];
+                       Host_ClientCommands(va("sendcvar %s\n", c->name));
+               }
+       host_client = old;
 }
 
 static void MaxPlayers_f(void)
@@ -1877,7 +1975,7 @@ static void MaxPlayers_f(void)
        if (svs.clients)
                Mem_Free(svs.clients);
        svs.maxclients = n;
-       svs.clients = Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
+       svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
        if (n == 1)
                Cvar_Set ("deathmatch", "0");
        else
@@ -1886,6 +1984,305 @@ static void MaxPlayers_f(void)
 
 //=============================================================================
 
+// QuakeWorld commands
+
+/*
+=====================
+Host_Rcon_f
+
+  Send the rest of the command line over as
+  an unconnected command.
+=====================
+*/
+void Host_Rcon_f (void) // credit: taken from QuakeWorld
+{
+       int i;
+       lhnetaddress_t to;
+       lhnetsocket_t *mysocket;
+
+       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
+       {
+               if (!rcon_address.integer || !rcon_address.string[0])
+               {
+                       Con_Printf ("You must either be connected, or set the rcon_address cvar to issue rcon commands\n");
+                       return;
+               }
+               LHNETADDRESS_FromString(&to, rcon_address.string, sv_netport.integer);
+       }
+       mysocket = NetConn_ChooseClientSocketForAddress(&to);
+       if (mysocket)
+       {
+               // simply put together the rcon packet and send it
+               NetConn_WriteString(mysocket, va("\377\377\377\377rcon %s %s", rcon_password.string, Cmd_Args()), &to);
+       }
+}
+
+/*
+====================
+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++;
+
+               if (!strcasecmp(key, "pmodel") || !strcasecmp(key, "emodel"))
+                       continue;
+
+               if (key[0] == '*')
+               {
+                       Con_Printf("Can't set star-key \"%s\" to \"%s\"\n", key, value);
+                       continue;
+               }
+
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), key, value);
+       }
+}
+
+/*
+==================
+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;
+       }
+       if (!strcasecmp(Cmd_Argv(1), "pmodel") || !strcasecmp(Cmd_Argv(1), "emodel"))
+               return;
+       if (Cmd_Argv(1)[0] == '*')
+       {
+               Con_Printf("Can't set star-key \"%s\" to \"%s\"\n", Cmd_Argv(1), Cmd_Argv(2));
+               return;
+       }
+       InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), Cmd_Argv(1), Cmd_Argv(2));
+       if (cls.state == ca_connected)
+               Cmd_ForwardToServer ();
+}
+
+/*
+====================
+Host_Packet_f
+
+packet <destination> <contents>
+
+Contents allows \n escape character
+====================
+*/
+void Host_Packet_f (void) // credit: taken from QuakeWorld
+{
+       char send[2048];
+       int i, l;
+       const char *in;
+       char *out;
+       lhnetaddress_t address;
+       lhnetsocket_t *mysocket;
+
+       if (Cmd_Argc() != 3)
+       {
+               Con_Printf ("packet <destination> <contents>\n");
+               return;
+       }
+
+       if (!LHNETADDRESS_FromString (&address, Cmd_Argv(1), sv_netport.integer))
+       {
+               Con_Printf ("Bad address\n");
+               return;
+       }
+
+       in = Cmd_Argv(2);
+       out = send+4;
+       send[0] = send[1] = send[2] = send[3] = 0xff;
+
+       l = (int)strlen (in);
+       for (i=0 ; i<l ; i++)
+       {
+               if (out >= send + sizeof(send) - 1)
+                       break;
+               if (in[i] == '\\' && in[i+1] == 'n')
+               {
+                       *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];
+       }
+
+       mysocket = NetConn_ChooseClientSocketForAddress(&address);
+       if (mysocket)
+               NetConn_Write(mysocket, send, out - send, &address);
+}
+
+//=============================================================================
+
 /*
 ==================
 Host_InitCommands
@@ -1893,71 +2290,85 @@ Host_InitCommands
 */
 void Host_InitCommands (void)
 {
-       Cmd_AddCommand ("status", Host_Status_f);
-       Cmd_AddCommand ("quit", Host_Quit_f);
+       strcpy(cls.userinfo, "\\name\\player\\team\\none\\topcolor\\0\\bottomcolor\\0\\rate\\10000\\msg\\1\\*ver\\dp");
+
+       Cmd_AddCommand ("status", Host_Status_f, "print server status information");
+       Cmd_AddCommand ("quit", Host_Quit_f, "quit the game");
        if (gamemode == GAME_NEHAHRA)
        {
-               Cmd_AddCommand ("max", Host_God_f);
-               Cmd_AddCommand ("monster", Host_Notarget_f);
-               Cmd_AddCommand ("scrag", Host_Fly_f);
-               Cmd_AddCommand ("wraith", Host_Noclip_f);
-               Cmd_AddCommand ("gimme", Host_Give_f);
+               Cmd_AddCommand ("max", Host_God_f, "god mode (invulnerability)");
+               Cmd_AddCommand ("monster", Host_Notarget_f, "notarget mode (monsters do not see you)");
+               Cmd_AddCommand ("scrag", Host_Fly_f, "fly mode (flight)");
+               Cmd_AddCommand ("wraith", Host_Noclip_f, "noclip mode (flight without collisions, move through walls)");
+               Cmd_AddCommand ("gimme", Host_Give_f, "alter inventory");
        }
        else
        {
-               Cmd_AddCommand ("god", Host_God_f);
-               Cmd_AddCommand ("notarget", Host_Notarget_f);
-               Cmd_AddCommand ("fly", Host_Fly_f);
-               Cmd_AddCommand ("noclip", Host_Noclip_f);
-               Cmd_AddCommand ("give", Host_Give_f);
-       }
-       Cmd_AddCommand ("map", Host_Map_f);
-       Cmd_AddCommand ("restart", Host_Restart_f);
-       Cmd_AddCommand ("changelevel", Host_Changelevel_f);
-       Cmd_AddCommand ("connect", Host_Connect_f);
-       Cmd_AddCommand ("reconnect", Host_Reconnect_f);
-       Cmd_AddCommand ("version", Host_Version_f);
-       Cmd_AddCommand ("say", Host_Say_f);
-       Cmd_AddCommand ("say_team", Host_Say_Team_f);
-       Cmd_AddCommand ("tell", Host_Tell_f);
-       Cmd_AddCommand ("kill", Host_Kill_f);
-       Cmd_AddCommand ("pause", Host_Pause_f);
-       Cmd_AddCommand ("kick", Host_Kick_f);
-       Cmd_AddCommand ("ping", Host_Ping_f);
-       Cmd_AddCommand ("load", Host_Loadgame_f);
-       Cmd_AddCommand ("save", Host_Savegame_f);
-
-       Cmd_AddCommand ("startdemos", Host_Startdemos_f);
-       Cmd_AddCommand ("demos", Host_Demos_f);
-       Cmd_AddCommand ("stopdemo", Host_Stopdemo_f);
-
-       Cmd_AddCommand ("viewmodel", Host_Viewmodel_f);
-       Cmd_AddCommand ("viewframe", Host_Viewframe_f);
-       Cmd_AddCommand ("viewnext", Host_Viewnext_f);
-       Cmd_AddCommand ("viewprev", Host_Viewprev_f);
+               Cmd_AddCommand ("god", Host_God_f, "god mode (invulnerability)");
+               Cmd_AddCommand ("notarget", Host_Notarget_f, "notarget mode (monsters do not see you)");
+               Cmd_AddCommand ("fly", Host_Fly_f, "fly mode (flight)");
+               Cmd_AddCommand ("noclip", Host_Noclip_f, "noclip mode (flight without collisions, move through walls)");
+               Cmd_AddCommand ("give", Host_Give_f, "alter inventory");
+       }
+       Cmd_AddCommand ("map", Host_Map_f, "kick everyone off the server and start a new level");
+       Cmd_AddCommand ("restart", Host_Restart_f, "restart current level");
+       Cmd_AddCommand ("changelevel", Host_Changelevel_f, "change to another level, bringing along all connected clients");
+       Cmd_AddCommand ("connect", Host_Connect_f, "connect to a server by IP address or hostname");
+       Cmd_AddCommand ("reconnect", Host_Reconnect_f, "reset signon level in preparation for a new level (do not use)");
+       Cmd_AddCommand ("version", Host_Version_f, "print engine version");
+       Cmd_AddCommand ("say", Host_Say_f, "send a chat message to everyone on the server");
+       Cmd_AddCommand ("say_team", Host_Say_Team_f, "send a chat message to your team on the server");
+       Cmd_AddCommand ("tell", Host_Tell_f, "send a chat message to only one person on the server");
+       Cmd_AddCommand ("kill", Host_Kill_f, "die instantly");
+       Cmd_AddCommand ("pause", Host_Pause_f, "pause the game (if the server allows pausing)");
+       Cmd_AddCommand ("kick", Host_Kick_f, "kick a player off the server by number or name");
+       Cmd_AddCommand ("ping", Host_Ping_f, "print ping times of all players on the server");
+       Cmd_AddCommand ("load", Host_Loadgame_f, "load a saved game file");
+       Cmd_AddCommand ("save", Host_Savegame_f, "save the game to a file");
+
+       Cmd_AddCommand ("startdemos", Host_Startdemos_f, "start playing back the selected demos sequentially (used at end of startup script)");
+       Cmd_AddCommand ("demos", Host_Demos_f, "restart looping demos defined by the last startdemos command");
+       Cmd_AddCommand ("stopdemo", Host_Stopdemo_f, "stop playing or recording demo (like stop command) and return to looping demos");
+
+       Cmd_AddCommand ("viewmodel", Host_Viewmodel_f, "change model of viewthing entity in current level");
+       Cmd_AddCommand ("viewframe", Host_Viewframe_f, "change animation frame of viewthing entity in current level");
+       Cmd_AddCommand ("viewnext", Host_Viewnext_f, "change to next animation frame of viewthing entity in current level");
+       Cmd_AddCommand ("viewprev", Host_Viewprev_f, "change to previous animation frame of viewthing entity in current level");
 
        Cvar_RegisterVariable (&cl_name);
-       Cmd_AddCommand ("name", Host_Name_f);
+       Cmd_AddCommand ("name", Host_Name_f, "change your player name");
        Cvar_RegisterVariable (&cl_color);
-       Cmd_AddCommand ("color", Host_Color_f);
+       Cmd_AddCommand ("color", Host_Color_f, "change your player shirt and pants colors");
        Cvar_RegisterVariable (&cl_rate);
-       Cmd_AddCommand ("rate", Host_Rate_f);
+       Cmd_AddCommand ("rate", Host_Rate_f, "change your network connection speed");
        if (gamemode == GAME_NEHAHRA)
        {
                Cvar_RegisterVariable (&cl_pmodel);
-               Cmd_AddCommand ("pmodel", Host_PModel_f);
+               Cmd_AddCommand ("pmodel", Host_PModel_f, "change your player model choice (Nehahra specific)");
        }
 
        // BLACK: This isnt game specific anymore (it was GAME_NEXUIZ at first)
        Cvar_RegisterVariable (&cl_playermodel);
-       Cmd_AddCommand ("playermodel", Host_Playermodel_f);
+       Cmd_AddCommand ("playermodel", Host_Playermodel_f, "change your player model");
        Cvar_RegisterVariable (&cl_playerskin);
-       Cmd_AddCommand ("playerskin", Host_Playerskin_f);
-
-       Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
-       Cmd_AddCommand ("spawn", Host_Spawn_f);
-       Cmd_AddCommand ("begin", Host_Begin_f);
-       Cmd_AddCommand ("maxplayers", MaxPlayers_f);
+       Cmd_AddCommand ("playerskin", Host_Playerskin_f, "change your player skin number");
+
+       Cmd_AddCommand ("prespawn", Host_PreSpawn_f, "signon 1 (client acknowledges that server information has been received)");
+       Cmd_AddCommand ("spawn", Host_Spawn_f, "signon 2 (client has sent player information, and is asking server to send scoreboard rankings)");
+       Cmd_AddCommand ("begin", Host_Begin_f, "signon 3 (client asks server to start sending entities, and will go to signon 4 (playing) when the first entity update is received)");
+       Cmd_AddCommand ("maxplayers", MaxPlayers_f, "sets limit on how many players (or bots) may be connected to the server at once");
+
+       Cmd_AddCommand ("sendcvar", Host_SendCvar_f, "sends the value of a cvar to the server as a sentcvar command, for use by QuakeC");       // By [515]
+
+       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");
 
        Cvar_RegisterVariable(&sv_cheats);
 }