]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - host_cmd.c
added a newline to chat messages
[xonotic/darkplaces.git] / host_cmd.c
index 841ca3e86d883ff283d584a76db034c7757be8f8..dab3c3c16ca31279992b76012bd95c99c7093648 100644 (file)
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -20,11 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-extern cvar_t  pausable;
+int current_skill;
+cvar_t sv_cheats = {0, "sv_cheats", "0"};
+qboolean allowcheats = false;
 
-int    current_skill;
-
-void Mod_Print (void);
+mfunction_t *ED_FindFunction (char *name);
 
 /*
 ==================
@@ -32,20 +32,12 @@ Host_Quit_f
 ==================
 */
 
-// LordHavoc: didn't like it asking me if I wanted to quit
-//extern void M_Menu_Quit_f (void);
-
+extern qboolean host_shuttingdown;
 void Host_Quit_f (void)
 {
-       /*
-       if (key_dest != key_console && cls.state != ca_dedicated)
-       {
-               M_Menu_Quit_f ();
-               return;
-       }
-       */
+       host_shuttingdown = true;
        CL_Disconnect ();
-       Host_ShutdownServer(false);             
+       Host_ShutdownServer(false);
 
        Sys_Quit ();
 }
@@ -58,13 +50,11 @@ Host_Status_f
 */
 void Host_Status_f (void)
 {
-       client_t        *client;
-       int                     seconds;
-       int                     minutes;
-       int                     hours = 0;
-       int                     j;
-       void            (*print) (char *fmt, ...);
-       
+       const char *protocolname;
+       client_t *client;
+       int seconds, minutes, hours = 0, j, players;
+       void (*print) (const char *fmt, ...);
+
        if (cmd_source == src_command)
        {
                if (!sv.active)
@@ -77,19 +67,29 @@ void Host_Status_f (void)
        else
                print = SV_ClientPrintf;
 
+       for (players = 0, j = 0;j < svs.maxclients;j++)
+               if (svs.clients[j].active)
+                       players++;
        print ("host:    %s\n", Cvar_VariableString ("hostname"));
-       print ("version: %4.2f\n", VERSION);
-       if (tcpipAvailable)
-               print ("tcp/ip:  %s\n", my_tcpip_address);
-       if (ipxAvailable)
-               print ("ipx:     %s\n", my_ipx_address);
+       print ("version: %s build %s\n", gamename, buildstring);
+       switch(sv.protocol)
+       {
+               case PROTOCOL_QUAKE: protocolname = sv.netquakecompatible ? "QUAKE" : "QUAKEDP";break;
+               case PROTOCOL_DARKPLACES1: protocolname = "PROTOCOL_DARKPLACES1";break;
+               case PROTOCOL_DARKPLACES2: protocolname = "PROTOCOL_DARKPLACES2";break;
+               case PROTOCOL_DARKPLACES3: protocolname = "PROTOCOL_DARKPLACES3";break;
+               case PROTOCOL_DARKPLACES4: protocolname = "PROTOCOL_DARKPLACES4";break;
+               case PROTOCOL_DARKPLACES5: protocolname = "PROTOCOL_DARKPLACES5";break;
+               default: protocolname = "PROTOCOL_UNKNOWN";break;
+       }
+       print ("protocol: %i (%s)\n", sv.protocol, protocolname);
        print ("map:     %s\n", sv.name);
-       print ("players: %i active (%i max)\n\n", net_activeconnections, svs.maxclients);
-       for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
+       print ("players: %i active (%i max)\n\n", players, svs.maxclients);
+       for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
        {
                if (!client->active)
                        continue;
-               seconds = (int)(net_time - client->netconnection->connecttime);
+               seconds = (int)(realtime - client->netconnection->connecttime);
                minutes = seconds / 60;
                if (minutes)
                {
@@ -100,7 +100,7 @@ void Host_Status_f (void)
                }
                else
                        hours = 0;
-               print ("#%-2u %-16.16s  %3i  %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v.frags, hours, minutes, seconds);
+               print ("#%-2u %-16.16s  %3i  %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v->frags, hours, minutes, seconds);
                print ("   %s\n", client->netconnection->address);
        }
 }
@@ -121,14 +121,20 @@ void Host_God_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (!sv_player)
                return;
 
-       sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE;
-       if (!((int)sv_player->v.flags & FL_GODMODE) )
-               SV_ClientPrintf ("godmode OFF\n");
+       if (!allowcheats)
+       {
+               SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+               return;
+       }
+
+       sv_player->v->flags = (int)sv_player->v->flags ^ FL_GODMODE;
+       if (!((int)sv_player->v->flags & FL_GODMODE) )
+               SV_ClientPrint("godmode OFF\n");
        else
-               SV_ClientPrint("godmode ON\n");
+               SV_ClientPrint("godmode ON\n");
 }
 
 void Host_Notarget_f (void)
@@ -139,14 +145,20 @@ void Host_Notarget_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (!sv_player)
+               return;
+
+       if (!allowcheats)
+       {
+               SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
                return;
+       }
 
-       sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET;
-       if (!((int)sv_player->v.flags & FL_NOTARGET) )
-               SV_ClientPrint("notarget OFF\n");
+       sv_player->v->flags = (int)sv_player->v->flags ^ FL_NOTARGET;
+       if (!((int)sv_player->v->flags & FL_NOTARGET) )
+               SV_ClientPrint("notarget OFF\n");
        else
-               SV_ClientPrint("notarget ON\n");
+               SV_ClientPrint("notarget ON\n");
 }
 
 qboolean noclip_anglehack;
@@ -159,20 +171,26 @@ void Host_Noclip_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (!sv_player)
                return;
 
-       if (sv_player->v.movetype != MOVETYPE_NOCLIP)
+       if (!allowcheats)
+       {
+               SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+               return;
+       }
+
+       if (sv_player->v->movetype != MOVETYPE_NOCLIP)
        {
                noclip_anglehack = true;
-               sv_player->v.movetype = MOVETYPE_NOCLIP;
-               SV_ClientPrint("noclip ON\n");
+               sv_player->v->movetype = MOVETYPE_NOCLIP;
+               SV_ClientPrint("noclip ON\n");
        }
        else
        {
                noclip_anglehack = false;
-               sv_player->v.movetype = MOVETYPE_WALK;
-               SV_ClientPrint("noclip OFF\n");
+               sv_player->v->movetype = MOVETYPE_WALK;
+               SV_ClientPrint("noclip OFF\n");
        }
 }
 
@@ -191,18 +209,24 @@ void Host_Fly_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (!sv_player)
+               return;
+
+       if (!allowcheats)
+       {
+               SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
                return;
+       }
 
-       if (sv_player->v.movetype != MOVETYPE_FLY)
+       if (sv_player->v->movetype != MOVETYPE_FLY)
        {
-               sv_player->v.movetype = MOVETYPE_FLY;
-               SV_ClientPrint("flymode ON\n");
+               sv_player->v->movetype = MOVETYPE_FLY;
+               SV_ClientPrint("flymode ON\n");
        }
        else
        {
-               sv_player->v.movetype = MOVETYPE_WALK;
-               SV_ClientPrint("flymode OFF\n");
+               sv_player->v->movetype = MOVETYPE_WALK;
+               SV_ClientPrint("flymode OFF\n");
        }
 }
 
@@ -218,15 +242,15 @@ void Host_Ping_f (void)
        int             i, j;
        float   total;
        client_t        *client;
-       
+
        if (cmd_source == src_command)
        {
                Cmd_ForwardToServer ();
                return;
        }
 
-       SV_ClientPrint("Client ping times:\n");
-       for (i=0, client = svs.clients ; i<svs.maxclients ; i++, client++)
+       SV_ClientPrint("Client ping times:\n");
+       for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
        {
                if (!client->active)
                        continue;
@@ -234,7 +258,7 @@ void Host_Ping_f (void)
                for (j=0 ; j<NUM_PING_TIMES ; j++)
                        total+=client->ping_times[j];
                total /= NUM_PING_TIMES;
-               SV_ClientPrintf ("%4i %s\n", (int)(total*1000), client->name);
+               SV_ClientPrintf("%4i %s\n", (int)(total*1000), client->name);
        }
 }
 
@@ -246,58 +270,44 @@ SERVER TRANSITIONS
 ===============================================================================
 */
 
-
 /*
 ======================
 Host_Map_f
 
-handle a 
+handle a
 map <servername>
 command from the console.  Active clients are kicked off.
 ======================
 */
 void Host_Map_f (void)
 {
-       int             i;
-       char    name[MAX_QPATH];
+       char level[MAX_QPATH];
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Print("map <levelname> : start a new game (kicks off all players)\n");
+               return;
+       }
 
        if (cmd_source != src_command)
                return;
 
+       SCR_BeginLoadingPlaque ();
        cls.demonum = -1;               // stop demo loop in case this fails
 
        CL_Disconnect ();
-       Host_ShutdownServer(false);             
+       Host_ShutdownServer(false);
 
-       key_dest = key_game;                    // remove console or menu
-       SCR_BeginLoadingPlaque ();
-
-       cls.mapstring[0] = 0;
-       for (i=0 ; i<Cmd_Argc() ; i++)
-       {
-               strcat (cls.mapstring, Cmd_Argv(i));
-               strcat (cls.mapstring, " ");
-       }
-       strcat (cls.mapstring, "\n");
+       // remove console or menu
+       key_dest = key_game;
+       key_consoleactive = 0;
 
        svs.serverflags = 0;                    // haven't completed an episode yet
-       strcpy (name, Cmd_Argv(1));
-       SV_SpawnServer (name);
-       if (!sv.active)
-               return;
-       
-       if (cls.state != ca_dedicated)
-       {
-               strcpy (cls.spawnparms, "");
-
-               for (i=2 ; i<Cmd_Argc() ; i++)
-               {
-                       strcat (cls.spawnparms, Cmd_Argv(i));
-                       strcat (cls.spawnparms, " ");
-               }
-               
-               Cmd_ExecuteString ("connect local", src_command);
-       }       
+       allowcheats = sv_cheats.integer != 0;
+       strcpy(level, Cmd_Argv(1));
+       SV_SpawnServer(level);
+       if (sv.active && cls.state == ca_disconnected)
+               CL_EstablishConnection("local:1");
 }
 
 /*
@@ -309,21 +319,32 @@ Goes to a new map, taking all clients along
 */
 void Host_Changelevel_f (void)
 {
-       char    level[MAX_QPATH];
-
+       char level[MAX_QPATH];
+       
        if (Cmd_Argc() != 2)
        {
-               Con_Print("changelevel <levelname> : continue game on a new level\n");
+               Con_Print("changelevel <levelname> : continue game on a new level\n");
                return;
        }
        if (!sv.active || cls.demoplayback)
        {
-               Con_Print("Only the server may changelevel\n");
+               Con_Print("Only the server may changelevel\n");
                return;
        }
+       if (cmd_source != src_command)
+               return;
+
+       // remove console or menu
+       key_dest = key_game;
+       key_consoleactive = 0;
+
        SV_SaveSpawnparms ();
-       strcpy (level, Cmd_Argv(1));
-       SV_SpawnServer (level);
+       SCR_BeginLoadingPlaque();
+       allowcheats = sv_cheats.integer != 0;
+       strcpy(level, Cmd_Argv(1));
+       SV_SpawnServer(level);
+       if (sv.active && cls.state == ca_disconnected)
+               CL_EstablishConnection("local:1");
 }
 
 /*
@@ -335,16 +356,31 @@ Restarts the current server for a dead player
 */
 void Host_Restart_f (void)
 {
-       char    mapname[MAX_QPATH];
-
-       if (cls.demoplayback || !sv.active)
+       char mapname[MAX_QPATH];
+       
+       if (Cmd_Argc() != 1)
+       {
+               Con_Print("restart : restart current level\n");
                return;
-
+       }
+       if (!sv.active || cls.demoplayback)
+       {
+               Con_Print("Only the server may restart\n");
+               return;
+       }
        if (cmd_source != src_command)
                return;
-       strcpy (mapname, sv.name);      // must copy out, because it gets cleared
-                                                               // in sv_spawnserver
-       SV_SpawnServer (mapname);
+
+       // remove console or menu
+       key_dest = key_game;
+       key_consoleactive = 0;
+
+       SCR_BeginLoadingPlaque();
+       allowcheats = sv_cheats.integer != 0;
+       strcpy(mapname, sv.name);
+       SV_SpawnServer(mapname);
+       if (sv.active && cls.state == ca_disconnected)
+               CL_EstablishConnection("local:1");
 }
 
 /*
@@ -357,7 +393,17 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
-       SCR_BeginLoadingPlaque ();
+       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;
+       }
+       SCR_BeginLoadingPlaque();
        cls.signon = 0;         // need new connection messages
 }
 
@@ -370,17 +416,12 @@ User command to connect to server
 */
 void Host_Connect_f (void)
 {
-       char    name[MAX_QPATH];
-       
-       cls.demonum = -1;               // stop demo loop in case this fails
-       if (cls.demoplayback)
+       if (Cmd_Argc() != 2)
        {
-               CL_StopPlayback ();
-               CL_Disconnect ();
+               Con_Print("connect <serveraddress> : connect to a multiplayer game\n");
+               return;
        }
-       strcpy (name, Cmd_Argv(1));
-       CL_EstablishConnection (name);
-       Host_Reconnect_f ();
+       CL_EstablishConnection(Cmd_Argv(1));
 }
 
 
@@ -398,7 +439,7 @@ LOAD / SAVE GAME
 ===============
 Host_SavegameComment
 
-Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current 
+Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current
 ===============
 */
 void Host_SavegameComment (char *text)
@@ -427,80 +468,82 @@ Host_Savegame_f
 void Host_Savegame_f (void)
 {
        char    name[256];
-       FILE    *f;
+       qfile_t *f;
        int             i;
        char    comment[SAVEGAME_COMMENT_LENGTH+1];
 
        if (cmd_source != src_command)
                return;
 
-       if (!sv.active)
+       if (cls.state != ca_connected || !sv.active)
        {
-               Con_Print("Not playing a local game.\n");
+               Con_Print("Not playing a local game.\n");
                return;
        }
 
        if (cl.intermission)
        {
-               Con_Print("Can't save in intermission.\n");
+               Con_Print("Can't save in intermission.\n");
                return;
        }
 
-       if (svs.maxclients != 1)
+       for (i = 0;i < svs.maxclients;i++)
        {
-               Con_Printf ("Can't save multiplayer games.\n");
-               return;
+               if (svs.clients[i].active)
+               {
+                       if (i > 0)
+                       {
+                               Con_Print("Can't save multiplayer games.\n");
+                               return;
+                       }
+                       if (svs.clients[i].edict->v->deadflag)
+                       {
+                               Con_Print("Can't savegame with a dead player\n");
+                               return;
+                       }
+               }
        }
 
        if (Cmd_Argc() != 2)
        {
-               Con_Print("save <savename> : save a game\n");
+               Con_Print("save <savename> : save a game\n");
                return;
        }
 
        if (strstr(Cmd_Argv(1), ".."))
        {
-               Con_Print("Relative pathnames are not allowed.\n");
+               Con_Print("Relative pathnames are not allowed.\n");
                return;
        }
-               
-       for (i=0 ; i<svs.maxclients ; i++)
-       {
-               if (svs.clients[i].active && (svs.clients[i].edict->v.health <= 0) )
-               {
-                       Con_Printf ("Can't savegame with a dead player\n");
-                       return;
-               }
-       }
 
-       sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
-       COM_DefaultExtension (name, ".sav");
-       
-       Con_Printf ("Saving game to %s...\n", name);
-       f = fopen (name, "w");
+       strlcpy (name, Cmd_Argv(1), sizeof (name));
+       FS_DefaultExtension (name, ".sav", sizeof (name));
+
+       Con_Printf("Saving game to %s...\n", name);
+       f = FS_Open (name, "w", false);
        if (!f)
        {
-               Con_Print("ERROR: couldn't open.\n");
+               Con_Print("ERROR: couldn't open.\n");
                return;
        }
-       
-       fprintf (f, "%i\n", SAVEGAME_VERSION);
+
+       FS_Printf(f, "%i\n", SAVEGAME_VERSION);
        Host_SavegameComment (comment);
-       fprintf (f, "%s\n", comment);
+       FS_Printf(f, "%s\n", comment);
        for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
-               fprintf (f, "%f\n", svs.clients->spawn_parms[i]);
-       fprintf (f, "%d\n", current_skill);
-       fprintf (f, "%s\n", sv.name);
-       fprintf (f, "%f\n",sv.time);
+               FS_Printf(f, "%f\n", svs.clients[0].spawn_parms[i]);
+       FS_Printf(f, "%d\n", current_skill);
+       FS_Printf(f, "%s\n", sv.name);
+       FS_Printf(f, "%f\n",sv.time);
 
 // write the light styles
 
        for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
        {
                if (sv.lightstyles[i])
-                       fprintf (f, "%s\n", sv.lightstyles[i]);
+                       FS_Printf(f, "%s\n", sv.lightstyles[i]);
                else
-                       fprintf (f,"m\n");
+                       FS_Print(f,"m\n");
        }
 
 
@@ -508,13 +551,15 @@ void Host_Savegame_f (void)
        for (i=0 ; i<sv.num_edicts ; i++)
        {
                ED_Write (f, EDICT_NUM(i));
-               fflush (f);
+               FS_Flush (f);
        }
-       fclose (f);
-       Con_Print("done.\n");
+       FS_Close (f);
+       Con_Print("done.\n");
 }
 
 
+extern mempool_t *edictstring_mempool;
+
 /*
 ===============
 Host_Loadgame_f
@@ -522,67 +567,75 @@ Host_Loadgame_f
 */
 void Host_Loadgame_f (void)
 {
-       char    name[MAX_OSPATH];
-       FILE    *f;
-       char    mapname[MAX_QPATH];
-       float   time, tfloat;
-       char    str[32768], *start;
-       int             i, r;
-       edict_t *ent;
-       int             entnum;
-       int             version;
-       float                   spawn_parms[NUM_SPAWN_PARMS];
+       qfile_t *f;
+       char filename[MAX_QPATH];
+       char mapname[MAX_QPATH];
+       float time, tfloat;
+       char buf[32768];
+       const char *start;
+       char *str;
+       int i, r;
+       edict_t *ent;
+       int entnum;
+       int version;
+       float spawn_parms[NUM_SPAWN_PARMS];
 
        if (cmd_source != src_command)
                return;
 
        if (Cmd_Argc() != 2)
        {
-               Con_Print("load <savename> : load a game\n");
+               Con_Print("load <savename> : load a game\n");
                return;
        }
 
-       cls.demonum = -1;               // stop demo loop in case this fails
+       strcpy (filename, Cmd_Argv(1));
+       FS_DefaultExtension (filename, ".sav", sizeof (filename));
 
-       sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
-       COM_DefaultExtension (name, ".sav");
-       
-// we can't call SCR_BeginLoadingPlaque, because too much stack space has
-// been used.  The menu calls it before stuffing loadgame command
-//     SCR_BeginLoadingPlaque ();
+       Con_Printf("Loading game from %s...\n", filename);
+
+       cls.demonum = -1;               // stop demo loop in case this fails
 
-       Con_Printf ("Loading game from %s...\n", name);
-       f = fopen (name, "r");
+       f = FS_Open (filename, "r", false);
        if (!f)
        {
-               Con_Print("ERROR: couldn't open.\n");
+               Con_Print("ERROR: couldn't open.\n");
                return;
        }
 
-       fscanf (f, "%i\n", &version);
+       str = FS_Getline (f);
+       sscanf (str, "%i\n", &version);
        if (version != SAVEGAME_VERSION)
        {
-               fclose (f);
-               Con_Printf ("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
+               FS_Close (f);
+               Con_Printf("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
                return;
        }
-       fscanf (f, "%s\n", str);
-       for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
-               fscanf (f, "%f\n", &spawn_parms[i]);
+
+       SCR_BeginLoadingPlaque ();
+
+       str = FS_Getline (f);
+       for (i = 0;i < NUM_SPAWN_PARMS;i++)
+       {
+               str = FS_Getline (f);
+               sscanf (str, "%f\n", &spawn_parms[i]);
+       }
 // this silliness is so we can load 1.06 save files, which have float skill values
-       fscanf (f, "%f\n", &tfloat);
+       str = FS_Getline (f);
+       sscanf (str, "%f\n", &tfloat);
        current_skill = (int)(tfloat + 0.1);
        Cvar_SetValue ("skill", (float)current_skill);
 
-       fscanf (f, "%s\n",mapname);
-       fscanf (f, "%f\n",&time);
+       strcpy (mapname, FS_Getline (f));
 
-       CL_Disconnect_f ();
-       
+       str = FS_Getline (f);
+       sscanf (str, "%f\n",&time);
+
+       allowcheats = sv_cheats.integer != 0;
        SV_SpawnServer (mapname);
        if (!sv.active)
        {
-               Con_Print("Couldn't load map\n");
+               Con_Print("Couldn't load map\n");
                return;
        }
        sv.paused = true;               // pause until all clients connect
@@ -590,72 +643,78 @@ void Host_Loadgame_f (void)
 
 // load the light styles
 
-       for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
+       for (i = 0;i < MAX_LIGHTSTYLES;i++)
        {
-               fscanf (f, "%s\n", str);
-               sv.lightstyles[i] = Hunk_Alloc (strlen(str)+1);
+               str = FS_Getline (f);
+               sv.lightstyles[i] = Mem_Alloc(edictstring_mempool, strlen(str)+1);
                strcpy (sv.lightstyles[i], str);
        }
 
 // load the edicts out of the savegame file
-       entnum = -1;            // -1 is the globals
-       while (!feof(f))
+       // -1 is the globals
+       entnum = -1;
+       while (!FS_Eof (f))
        {
-               for (i=0 ; i<sizeof(str)-1 ; i++)
+               for (i = 0;i < (int)sizeof(buf) - 1;i++)
                {
-                       r = fgetc (f);
+                       r = FS_Getc (f);
                        if (r == EOF || !r)
                                break;
-                       str[i] = r;
+                       buf[i] = r;
                        if (r == '}')
                        {
                                i++;
                                break;
                        }
                }
-               if (i == sizeof(str)-1)
-                       Sys_Error ("Loadgame buffer overflow");
-               str[i] = 0;
-               start = str;
-               start = COM_Parse(str);
-               if (!com_token[0])
-                       break;          // end of file
+               if (i == sizeof(buf)-1)
+                       Host_Error ("Loadgame buffer overflow");
+               buf[i] = 0;
+               start = buf;
+               if (!COM_ParseToken(&start, false))
+               {
+                       // end of file
+                       break;
+               }
                if (strcmp(com_token,"{"))
-                       Sys_Error ("First token isn't a brace");
-                       
+                       Host_Error ("First token isn't a brace");
+
                if (entnum == -1)
-               {       // parse the global vars
+               {
+                       // parse the global vars
                        ED_ParseGlobals (start);
                }
                else
-               {       // parse an edict
-
+               {
+                       // parse an edict
+                       if (entnum >= MAX_EDICTS)
+                               Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)\n", MAX_EDICTS);
+                       while (entnum >= sv.max_edicts)
+                               SV_IncreaseEdicts();
                        ent = EDICT_NUM(entnum);
-                       memset (&ent->v, 0, progs->entityfields * 4);
-                       ent->free = false;
+                       memset (ent->v, 0, progs->entityfields * 4);
+                       ent->e->free = false;
                        ED_ParseEdict (start, ent);
-       
-               // link it into the bsp tree
-                       if (!ent->free)
+
+                       // link it into the bsp tree
+                       if (!ent->e->free)
                                SV_LinkEdict (ent, false);
                }
 
                entnum++;
        }
-       
+
        sv.num_edicts = entnum;
        sv.time = time;
 
-       fclose (f);
+       FS_Close (f);
 
-       for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
-               svs.clients->spawn_parms[i] = spawn_parms[i];
+       for (i = 0;i < NUM_SPAWN_PARMS;i++)
+               svs.clients[0].spawn_parms[i] = spawn_parms[i];
 
-       if (cls.state != ca_dedicated)
-       {
-               CL_EstablishConnection ("local");
-               Host_Reconnect_f ();
-       }
+       // 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");
 }
 
 //============================================================================
@@ -665,113 +724,74 @@ void Host_Loadgame_f (void)
 Host_Name_f
 ======================
 */
+cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"};
 void Host_Name_f (void)
 {
-       char    *newName;
+       int i, j;
+       char newName[sizeof(host_client->name)];
 
        if (Cmd_Argc () == 1)
        {
-               Con_Printf ("\"name\" is \"%s\"\n", cl_name.string);
+               Con_Printf("\"name\" is \"%s\"\n", cl_name.string);
                return;
        }
+
        if (Cmd_Argc () == 2)
-               newName = Cmd_Argv(1);  
+               strlcpy (newName, Cmd_Argv(1), sizeof (newName));
        else
-               newName = Cmd_Args();
-       newName[15] = 0;
+               strlcpy (newName, Cmd_Args(), sizeof (newName));
+
+       for (i = 0, j = 0;newName[i];i++)
+               if (newName[i] != '\r' && newName[i] != '\n')
+                       newName[j++] = newName[i];
+       newName[j] = 0;
 
        if (cmd_source == src_command)
        {
-               if (strcmp(cl_name.string, newName) == 0)
-                       return;
                Cvar_Set ("_cl_name", newName);
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
        }
 
-       if (host_client->name[0] && strcmp(host_client->name, "unconnected") )
-               if (strcmp(host_client->name, newName) != 0)
-                       Con_Printf ("%s renamed to %s\n", host_client->name, newName);
-       strcpy (host_client->name, newName);
-       host_client->edict->v.netname = host_client->name - pr_strings;
-       
-// send notification to all clients
+       if (sv.time < host_client->nametime)
+       {
+               SV_ClientPrintf("You can't change name more than once every 5 seconds!\n");
+               return;
+       }
        
-       MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
-       MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
-       MSG_WriteString (&sv.reliable_datagram, host_client->name);
-}
+       host_client->nametime = sv.time + 5;
 
-       
-void Host_Version_f (void)
-{
-       Con_Printf ("Version %4.2f\n", VERSION);
-       Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
-}
+       if (strcmp(host_client->name, newName) && host_client->name[0] && strcmp(host_client->name, "unconnected"))
+               SV_BroadcastPrintf("%s changed name to %s\n", host_client->name, newName);
+       strcpy(host_client->name, newName);
+       strcpy(host_client->old_name, newName);
+       if (sv_player)
+               sv_player->v->netname = PR_SetString(host_client->name);
+       //Con_Printf("Host_Name_f: host_client->edict->netname = %s, sv_player->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(sv_player->v->netname), host_client->name);
 
-#ifdef IDGODS
-void Host_Please_f (void)
-{
-       client_t *cl;
-       int                     j;
-       
-       if (cmd_source != src_command)
-               return;
+// send notification to all clients
 
-       if ((Cmd_Argc () == 3) && strcmp(Cmd_Argv(1), "#") == 0)
-       {
-               j = atof(Cmd_Argv(2)) - 1;
-               if (j < 0 || j >= svs.maxclients)
-                       return;
-               if (!svs.clients[j].active)
-                       return;
-               cl = &svs.clients[j];
-               if (cl->privileged)
-               {
-                       cl->privileged = false;
-                       cl->edict->v.flags = (int)cl->edict->v.flags & ~(FL_GODMODE|FL_NOTARGET);
-                       cl->edict->v.movetype = MOVETYPE_WALK;
-                       noclip_anglehack = false;
-               }
-               else
-                       cl->privileged = true;
-       }
+       MSG_WriteByte(&sv.reliable_datagram, svc_updatename);
+       MSG_WriteByte(&sv.reliable_datagram, host_client->number);
+       MSG_WriteString(&sv.reliable_datagram, host_client->name);
+}
 
-       if (Cmd_Argc () != 2)
-               return;
 
-       for (j=0, cl = svs.clients ; j<svs.maxclients ; j++, cl++)
-       {
-               if (!cl->active)
-                       continue;
-               if (strcasecmp(cl->name, Cmd_Argv(1)) == 0)
-               {
-                       if (cl->privileged)
-                       {
-                               cl->privileged = false;
-                               cl->edict->v.flags = (int)cl->edict->v.flags & ~(FL_GODMODE|FL_NOTARGET);
-                               cl->edict->v.movetype = MOVETYPE_WALK;
-                               noclip_anglehack = false;
-                       }
-                       else
-                               cl->privileged = true;
-                       break;
-               }
-       }
+void Host_Version_f (void)
+{
+       Con_Printf("Version: %s build %s\n", gamename, buildstring);
 }
-#endif
-
 
 void Host_Say(qboolean teamonly)
 {
-       client_t *client;
        client_t *save;
-       int             j;
-       char    *p;
+       int j, quoted;
+       const char *p1;
+       char *p2;
        // LordHavoc: 256 char say messages
-       unsigned char   text[256];
-       qboolean        fromServer = false;
+       unsigned char text[256];
+       qboolean fromServer = false;
 
        if (cmd_source == src_command)
        {
@@ -790,41 +810,39 @@ void Host_Say(qboolean teamonly)
        if (Cmd_Argc () < 2)
                return;
 
-       save = host_client;
+       if (!teamplay.integer)
+               teamonly = false;
 
-       p = Cmd_Args();
-// remove quotes if present
-       if (*p == '"')
+// turn on color set 1
+       p1 = Cmd_Args();
+       quoted = false;
+       if (*p1 == '\"')
        {
-               p++;
-               p[strlen(p)-1] = 0;
+               quoted = true;
+               p1++;
        }
-
-// turn on color set 1
        if (!fromServer)
-               sprintf (text, "%c%s: ", 1, save->name);
+               snprintf (text, sizeof(text), "%c%s: %s", 1, host_client->name, p1);
        else
-               sprintf (text, "%c<%s> ", 1, hostname.string);
-
-       j = sizeof(text) - 2 - strlen(text);  // -2 for /n and null terminator
-       if (strlen(p) > j)
-               p[j] = 0;
-
-       strcat (text, p);
-       strcat (text, "\n");
-
-       for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
+               snprintf (text, sizeof(text), "%c<%s> %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)))
        {
-               if (!client || !client->active || !client->spawned)
-                       continue;
-               if (teamplay.value && teamonly && client->edict->v.team != save->edict->v.team)
-                       continue;
-               host_client = client;
-               SV_ClientPrintf("%s", text);
+               if (p2[-1] == '\"' && quoted)
+                       quoted = false;
+               p2[-1] = 0;
+               p2--;
        }
+       strlcat(text, "\n");
+
+       // note: save is not a valid edict if fromServer is true
+       save = host_client;
+       for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++)
+               if (host_client->spawned && (!teamonly || host_client->edict->v->team == save->edict->v->team))
+                       SV_ClientPrint(text);
        host_client = save;
 
-       Sys_Printf("%s", &text[1]);
+       Sys_Print(&text[1]);
 }
 
 
@@ -842,52 +860,63 @@ void Host_Say_Team_f(void)
 
 void Host_Tell_f(void)
 {
-       client_t *client;
        client_t *save;
-       int             j;
-       char    *p;
-       char    text[64];
+       int j;
+       const char *p1, *p2;
+       char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64)
+       qboolean fromServer = false;
 
        if (cmd_source == src_command)
        {
-               Cmd_ForwardToServer ();
-               return;
+               if (cls.state == ca_dedicated)
+                       fromServer = true;
+               else
+               {
+                       Cmd_ForwardToServer ();
+                       return;
+               }
        }
 
        if (Cmd_Argc () < 3)
                return;
 
-       strcpy(text, host_client->name);
-       strcat(text, ": ");
-
-       p = Cmd_Args();
-
-// remove quotes if present
-       if (*p == '"')
-       {
-               p++;
-               p[strlen(p)-1] = 0;
+       if (!fromServer)
+               sprintf (text, "%s: ", host_client->name);
+       else
+               sprintf (text, "<%s> ", hostname.string);
+
+       p1 = Cmd_Args();
+       p2 = p1 + strlen(p1);
+       // remove the target name
+       while (p1 < p2 && *p1 != ' ')
+               p1++;
+       while (p1 < p2 && *p1 == ' ')
+               p1++;
+       // remove trailing newlines
+       while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+               p2--;
+       // remove quotes if present
+       if (*p1 == '"')
+       {
+               p1++;
+               if (p2[-1] == '"')
+                       p2--;
+               else if (fromServer)
+                       Con_Print("Host_Tell: missing end quote\n");
+               else
+                       SV_ClientPrint("Host_Tell: missing end quote\n");
        }
-
-// check length & truncate if necessary
-       j = sizeof(text) - 2 - strlen(text);  // -2 for /n and null terminator
-       if (strlen(p) > j)
-               p[j] = 0;
-
-       strcat (text, p);
-       strcat (text, "\n");
+       while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+               p2--;
+       for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
+               text[j++] = *p1++;
+       text[j++] = '\n';
+       text[j++] = 0;
 
        save = host_client;
-       for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
-       {
-               if (!client->active || !client->spawned)
-                       continue;
-               if (Q_strcasecmp(client->name, Cmd_Argv(1)))
-                       continue;
-               host_client = client;
-               SV_ClientPrintf("%s", text);
-               break;
-       }
+       for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++)
+               if (host_client->spawned && !strcasecmp(host_client->name, Cmd_Argv(1)))
+                       SV_ClientPrint(text);
        host_client = save;
 }
 
@@ -897,15 +926,18 @@ void Host_Tell_f(void)
 Host_Color_f
 ==================
 */
+cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0"};
 void Host_Color_f(void)
 {
        int             top, bottom;
        int             playercolor;
-       
+       mfunction_t *f;
+       func_t  SV_ChangeTeam;
+
        if (Cmd_Argc() == 1)
        {
-               Con_Printf ("\"color\" is \"%i %i\"\n", ((int)cl_color.value) >> 4, ((int)cl_color.value) & 0x0f);
-               Con_Printf ("color <0-13> [0-13]\n");
+               Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
+               Con_Print("color <0-15> [0-15]\n");
                return;
        }
 
@@ -916,7 +948,7 @@ void Host_Color_f(void)
                top = atoi(Cmd_Argv(1));
                bottom = atoi(Cmd_Argv(2));
        }
-       
+
        top &= 15;
        // LordHavoc: allow skin colormaps 14 and 15 (was 13)
        if (top > 15)
@@ -925,7 +957,7 @@ void Host_Color_f(void)
        // LordHavoc: allow skin colormaps 14 and 15 (was 13)
        if (bottom > 15)
                bottom = 15;
-       
+
        playercolor = top*16 + bottom;
 
        if (cmd_source == src_command)
@@ -936,13 +968,56 @@ void Host_Color_f(void)
                return;
        }
 
-       host_client->colors = playercolor;
-       host_client->edict->v.team = bottom + 1;
+       if (sv_player && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
+       {
+               Con_DPrint("Calling SV_ChangeTeam\n");
+               pr_global_struct->time = sv.time;
+               pr_globals[OFS_PARM0] = playercolor;
+               pr_global_struct->self = EDICT_TO_PROG(sv_player);
+               PR_ExecuteProgram (SV_ChangeTeam, "QC function SV_ChangeTeam is missing");
+       }
+       else
+       {
+               eval_t *val;
+               if (sv_player)
+               {
+                       if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)))
+                               val->_float = playercolor;
+                       sv_player->v->team = bottom + 1;
+               }
+               host_client->colors = playercolor;
+               host_client->old_colors = playercolor;
 
-// send notification to all clients
-       MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
-       MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
-       MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
+               // send notification to all clients
+               MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
+               MSG_WriteByte (&sv.reliable_datagram, host_client->number);
+               MSG_WriteByte (&sv.reliable_datagram, host_client->colors);
+       }
+}
+
+cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000"};
+void Host_Rate_f(void)
+{
+       int rate;
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf("\"rate\" is \"%i\"\n", cl_rate.integer);
+               Con_Print("rate <500-25000>\n");
+               return;
+       }
+
+       rate = atoi(Cmd_Argv(1));
+
+       if (cmd_source == src_command)
+       {
+               Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE));
+               if (cls.state == ca_connected)
+                       Cmd_ForwardToServer ();
+               return;
+       }
+
+       host_client->netconnection->rate = rate;
 }
 
 /*
@@ -958,15 +1033,15 @@ void Host_Kill_f (void)
                return;
        }
 
-       if (sv_player->v.health <= 0)
+       if (!sv_player || sv_player->v->health <= 0)
        {
-               SV_ClientPrintf ("Can't suicide -- allready dead!\n");
+               SV_ClientPrint("Can't suicide -- already dead!\n");
                return;
        }
-       
+
        pr_global_struct->time = sv.time;
-       pr_global_struct->self = EDICT_TO_PROG(sv_player);
-       PR_ExecuteProgram (pr_global_struct->ClientKill);
+       pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+       PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing");
 }
 
 
@@ -977,31 +1052,56 @@ Host_Pause_f
 */
 void Host_Pause_f (void)
 {
-       
+
        if (cmd_source == src_command)
        {
                Cmd_ForwardToServer ();
                return;
        }
-       if (!pausable.value)
-               SV_ClientPrint("Pause not allowed.\n");
+       if (!pausable.integer)
+               SV_ClientPrint("Pause not allowed.\n");
        else
        {
                sv.paused ^= 1;
+               SV_BroadcastPrintf("%s %spaused the game\n", host_client->name, sv.paused ? "" : "un");
+               // send notification to all clients
+               MSG_WriteByte(&sv.reliable_datagram, svc_setpause);
+               MSG_WriteByte(&sv.reliable_datagram, sv.paused);
+       }
+}
 
-               if (sv.paused)
-               {
-                       SV_BroadcastPrintf ("%s paused the game\n", pr_strings + sv_player->v.netname);
-               }
-               else
-               {
-                       SV_BroadcastPrintf ("%s unpaused the game\n",pr_strings + sv_player->v.netname);
-               }
+/*
+======================
+Host_PModel_f
+LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
+======================
+*/
+cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"};
+static void Host_PModel_f (void)
+{
+       int i;
+       eval_t *val;
 
-       // send notification to all clients
-               MSG_WriteByte (&sv.reliable_datagram, svc_setpause);
-               MSG_WriteByte (&sv.reliable_datagram, sv.paused);
+       if (Cmd_Argc () == 1)
+       {
+               Con_Printf("\"pmodel\" is \"%s\"\n", cl_pmodel.string);
+               return;
        }
+       i = atoi(Cmd_Argv(1));
+
+       if (cmd_source == src_command)
+       {
+               if (cl_pmodel.integer == i)
+                       return;
+               Cvar_SetValue ("_cl_pmodel", i);
+               if (cls.state == ca_connected)
+                       Cmd_ForwardToServer ();
+               return;
+       }
+
+       host_client->pmodel = i;
+       if (sv_player && (val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)))
+               val->_float = i;
 }
 
 //===========================================================================
@@ -1016,24 +1116,22 @@ void Host_PreSpawn_f (void)
 {
        if (cmd_source == src_command)
        {
-               Con_Print("prespawn is not valid from the console\n");
+               Con_Print("prespawn is not valid from the console\n");
                return;
        }
 
        if (host_client->spawned)
        {
-               Con_Printf ("prespawn not valid -- allready spawned\n");
+               Con_Print("prespawn not valid -- already spawned\n");
                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;
 }
 
-dfunction_t *ED_FindFunction (char *name);
-
 /*
 ==================
 Host_Spawn_f
@@ -1041,91 +1139,94 @@ Host_Spawn_f
 */
 void Host_Spawn_f (void)
 {
-       int             i;
-       client_t        *client;
-       edict_t *ent;
+       int i;
+       client_t *client;
        func_t RestoreGame;
-       dfunction_t *f;
+       mfunction_t *f;
 
        if (cmd_source == src_command)
        {
-               Con_Print("spawn is not valid from the console\n");
+               Con_Print("spawn is not valid from the console\n");
                return;
        }
 
        if (host_client->spawned)
        {
-               Con_Printf ("Spawn not valid -- allready spawned\n");
+               Con_Print("Spawn not valid -- already spawned\n");
+               return;
+       }
+
+       if (!sv_player)
+       {
+               Con_Print("Host_Spawn: no edict??\n");
                return;
        }
 
-// run the entrance script
+       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);
+
+       // run the entrance script
        if (sv.loadgame)
-       {       // loaded games are fully inited allready
+       {
+               // loaded games are fully initialized already
                // if this is the last client to be connected, unpause
                sv.paused = false;
 
-               if (f = ED_FindFunction ("RestoreGame"))
-               if (RestoreGame = (func_t)(f - pr_functions))
+               if ((f = ED_FindFunction ("RestoreGame")))
+               if ((RestoreGame = (func_t)(f - pr_functions)))
                {
-                       Con_DPrintf("Calling RestoreGame\n");
+                       Con_DPrint("Calling RestoreGame\n");
                        pr_global_struct->time = sv.time;
                        pr_global_struct->self = EDICT_TO_PROG(sv_player);
-                       PR_ExecuteProgram (RestoreGame);
+                       PR_ExecuteProgram (RestoreGame, "QC function RestoreGame is missing");
                }
        }
        else
        {
-               eval_t *val;
                // set up the edict
-               ent = host_client->edict;
+               ED_ClearEdict(sv_player);
 
-               memset (&ent->v, 0, progs->entityfields * 4);
-               ent->v.colormap = NUM_FOR_EDICT(ent);
-               ent->v.team = (host_client->colors & 15) + 1;
-               ent->v.netname = host_client->name - pr_strings;
-               if (val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel))
-                       val->_float = host_client->pmodel;
+               //Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, sv_player->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(sv_player->v->netname), host_client->name);
 
                // copy spawn parms out of the client_t
-
                for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
                        (&pr_global_struct->parm1)[i] = host_client->spawn_parms[i];
 
                // call the spawn function
-
                pr_global_struct->time = sv.time;
                pr_global_struct->self = EDICT_TO_PROG(sv_player);
-               PR_ExecuteProgram (pr_global_struct->ClientConnect);
+               PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing");
 
-               if ((Sys_FloatTime() - host_client->netconnection->connecttime) <= sv.time)
-                       Sys_Printf ("%s entered the game\n", host_client->name);
+               if ((Sys_DoubleTime() - host_client->netconnection->connecttime) <= sv.time)
+                       Sys_Printf("%s entered the game\n", host_client->name);
 
-               PR_ExecuteProgram (pr_global_struct->PutClientInServer);        
+               PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing");
        }
 
 
-// send all current names, colors, and frag counts
-       SZ_Clear (&host_client->message);
-
-// send time of update
+       // send time of update
        MSG_WriteByte (&host_client->message, svc_time);
        MSG_WriteFloat (&host_client->message, sv.time);
 
-       for (i=0, client = svs.clients ; i<svs.maxclients ; i++, client++)
+       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_WriteString (&host_client->message, client->old_name);
                MSG_WriteByte (&host_client->message, svc_updatefrags);
                MSG_WriteByte (&host_client->message, i);
                MSG_WriteShort (&host_client->message, client->old_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->message, client->old_colors);
        }
-       
-// send all current light styles
+
+       // send all current light styles
        for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
        {
                MSG_WriteByte (&host_client->message, svc_lightstyle);
@@ -1133,9 +1234,7 @@ void Host_Spawn_f (void)
                MSG_WriteString (&host_client->message, sv.lightstyles[i]);
        }
 
-//
-// send some stats
-//
+       // send some stats
        MSG_WriteByte (&host_client->message, svc_updatestat);
        MSG_WriteByte (&host_client->message, STAT_TOTALSECRETS);
        MSG_WriteLong (&host_client->message, pr_global_struct->total_secrets);
@@ -1152,17 +1251,15 @@ void Host_Spawn_f (void)
        MSG_WriteByte (&host_client->message, STAT_MONSTERS);
        MSG_WriteLong (&host_client->message, pr_global_struct->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
-       ent = EDICT_NUM( 1 + (host_client - svs.clients) );
+       // 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);
-       for (i=0 ; i < 2 ; i++)
-               MSG_WriteAngle (&host_client->message, ent->v.angles[i] );
-       MSG_WriteAngle (&host_client->message, 0 );
+       MSG_WriteAngle (&host_client->message, sv_player->v->angles[0], sv.protocol);
+       MSG_WriteAngle (&host_client->message, sv_player->v->angles[1], sv.protocol);
+       MSG_WriteAngle (&host_client->message, 0, sv.protocol);
 
        SV_WriteClientdataToMessage (sv_player, &host_client->message);
 
@@ -1180,7 +1277,7 @@ void Host_Begin_f (void)
 {
        if (cmd_source == src_command)
        {
-               Con_Print("begin is not valid from the console\n");
+               Con_Print("begin is not valid from the console\n");
                return;
        }
 
@@ -1199,21 +1296,13 @@ Kicks a user off of the server
 */
 void Host_Kick_f (void)
 {
-       char            *who;
-       char            *message = NULL;
-       client_t        *save;
-       int                     i;
-       qboolean        byNumber = false;
+       char *who;
+       const char *message = NULL;
+       client_t *save;
+       int i;
+       qboolean byNumber = false;
 
-       if (cmd_source == src_command)
-       {
-               if (!sv.active)
-               {
-                       Cmd_ForwardToServer ();
-                       return;
-               }
-       }
-       else if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (cmd_source != src_command || !sv.active)
                return;
 
        save = host_client;
@@ -1221,20 +1310,17 @@ void Host_Kick_f (void)
        if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0)
        {
                i = atof(Cmd_Argv(2)) - 1;
-               if (i < 0 || i >= svs.maxclients)
-                       return;
-               if (!svs.clients[i].active)
+               if (i < 0 || i >= svs.maxclients || !(host_client = svs.clients + i)->active)
                        return;
-               host_client = &svs.clients[i];
                byNumber = true;
        }
        else
        {
-               for (i = 0, host_client = svs.clients; i < svs.maxclients; i++, host_client++)
+               for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
                {
                        if (!host_client->active)
                                continue;
-                       if (Q_strcasecmp(host_client->name, Cmd_Argv(1)) == 0)
+                       if (strcasecmp(host_client->name, Cmd_Argv(1)) == 0)
                                break;
                }
        }
@@ -1242,10 +1328,12 @@ void Host_Kick_f (void)
        if (i < svs.maxclients)
        {
                if (cmd_source == src_command)
+               {
                        if (cls.state == ca_dedicated)
                                who = "Console";
                        else
                                who = cl_name.string;
+               }
                else
                        who = save->name;
 
@@ -1255,7 +1343,8 @@ void Host_Kick_f (void)
 
                if (Cmd_Argc() > 2)
                {
-                       message = COM_Parse(Cmd_Args());
+                       message = Cmd_Args();
+                       COM_ParseToken(&message, false);
                        if (byNumber)
                        {
                                message++;                                                      // skip the #
@@ -1267,10 +1356,10 @@ void Host_Kick_f (void)
                                message++;
                }
                if (message)
-                       SV_ClientPrintf ("Kicked by %s: %s\n", who, message);
+                       SV_ClientPrintf("Kicked by %s: %s\n", who, message);
                else
-                       SV_ClientPrintf ("Kicked by %s\n", who);
-               SV_DropClient (false);
+                       SV_ClientPrintf("Kicked by %s\n", who);
+               SV_DropClient (false); // kicked
        }
 
        host_client = save;
@@ -1291,9 +1380,9 @@ Host_Give_f
 */
 void Host_Give_f (void)
 {
-       char    *t;
-       int             v;
-       eval_t  *val;
+       const char *t;
+       int v;
+       eval_t *val;
 
        if (cmd_source == src_command)
        {
@@ -1301,158 +1390,161 @@ void Host_Give_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (!sv_player)
                return;
 
+       if (!allowcheats)
+       {
+               SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+               return;
+       }
+
        t = Cmd_Argv(1);
        v = atoi (Cmd_Argv(2));
-       
+
        switch (t[0])
        {
-   case '0':
-   case '1':
-   case '2':
-   case '3':
-   case '4':
-   case '5':
-   case '6':
-   case '7':
-   case '8':
-   case '9':
-      // MED 01/04/97 added hipnotic give stuff
-      if (hipnotic)
-      {
-         if (t[0] == '6')
-         {
-            if (t[1] == 'a')
-               sv_player->v.items = (int)sv_player->v.items | HIT_PROXIMITY_GUN;
-            else
-               sv_player->v.items = (int)sv_player->v.items | IT_GRENADE_LAUNCHER;
-         }
-         else if (t[0] == '9')
-            sv_player->v.items = (int)sv_player->v.items | HIT_LASER_CANNON;
-         else if (t[0] == '0')
-            sv_player->v.items = (int)sv_player->v.items | HIT_MJOLNIR;
-         else if (t[0] >= '2')
-            sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
-      }
-      else
-      {
-         if (t[0] >= '2')
-            sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
-      }
-               break;
-       
-    case 's':
-               if (rogue)
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':
+               // MED 01/04/97 added hipnotic give stuff
+               if (gamemode == GAME_HIPNOTIC)
                {
-                   if (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))
-                           val->_float = v;
+                       if (t[0] == '6')
+                       {
+                               if (t[1] == 'a')
+                                       sv_player->v->items = (int)sv_player->v->items | HIT_PROXIMITY_GUN;
+                               else
+                                       sv_player->v->items = (int)sv_player->v->items | IT_GRENADE_LAUNCHER;
+                       }
+                       else if (t[0] == '9')
+                               sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON;
+                       else if (t[0] == '0')
+                               sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR;
+                       else if (t[0] >= '2')
+                               sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
                }
+               else
+               {
+                       if (t[0] >= '2')
+                               sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
+               }
+               break;
+
+       case 's':
+               if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
+                       val->_float = v;
 
-        sv_player->v.ammo_shells = v;
-        break;         
-    case 'n':
-               if (rogue)
+               sv_player->v->ammo_shells = v;
+               break;
+       case 'n':
+               if (gamemode == GAME_ROGUE)
                {
-                   if (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1))
+                       if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1)))
                        {
-                           val->_float = v;
-                               if (sv_player->v.weapon <= IT_LIGHTNING)
-                                       sv_player->v.ammo_nails = v;
+                               val->_float = v;
+                               if (sv_player->v->weapon <= IT_LIGHTNING)
+                                       sv_player->v->ammo_nails = v;
                        }
                }
                else
                {
-                       sv_player->v.ammo_nails = v;
+                       sv_player->v->ammo_nails = v;
                }
-        break;         
-    case 'l':
-               if (rogue)
+               break;
+       case 'l':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_lava_nails);
                        if (val)
                        {
                                val->_float = v;
-                               if (sv_player->v.weapon > IT_LIGHTNING)
-                                       sv_player->v.ammo_nails = v;
+                               if (sv_player->v->weapon > IT_LIGHTNING)
+                                       sv_player->v->ammo_nails = v;
                        }
                }
-        break;
-    case 'r':
-               if (rogue)
+               break;
+       case 'r':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_rockets1);
                        if (val)
                        {
                                val->_float = v;
-                               if (sv_player->v.weapon <= IT_LIGHTNING)
-                                       sv_player->v.ammo_rockets = v;
+                               if (sv_player->v->weapon <= IT_LIGHTNING)
+                                       sv_player->v->ammo_rockets = v;
                        }
                }
                else
                {
-                       sv_player->v.ammo_rockets = v;
+                       sv_player->v->ammo_rockets = v;
                }
-        break;         
-    case 'm':
-               if (rogue)
+               break;
+       case 'm':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_multi_rockets);
                        if (val)
                        {
                                val->_float = v;
-                               if (sv_player->v.weapon > IT_LIGHTNING)
-                                       sv_player->v.ammo_rockets = v;
+                               if (sv_player->v->weapon > IT_LIGHTNING)
+                                       sv_player->v->ammo_rockets = v;
                        }
                }
-        break;         
-    case 'h':
-        sv_player->v.health = v;
-        break;         
-    case 'c':
-               if (rogue)
+               break;
+       case 'h':
+               sv_player->v->health = v;
+               break;
+       case 'c':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_cells1);
                        if (val)
                        {
                                val->_float = v;
-                               if (sv_player->v.weapon <= IT_LIGHTNING)
-                                       sv_player->v.ammo_cells = v;
+                               if (sv_player->v->weapon <= IT_LIGHTNING)
+                                       sv_player->v->ammo_cells = v;
                        }
                }
                else
                {
-                       sv_player->v.ammo_cells = v;
+                       sv_player->v->ammo_cells = v;
                }
-        break;         
-    case 'p':
-               if (rogue)
+               break;
+       case 'p':
+               if (gamemode == GAME_ROGUE)
                {
                        val = GETEDICTFIELDVALUE(sv_player, eval_ammo_plasma);
                        if (val)
                        {
                                val->_float = v;
-                               if (sv_player->v.weapon > IT_LIGHTNING)
-                                       sv_player->v.ammo_cells = v;
+                               if (sv_player->v->weapon > IT_LIGHTNING)
+                                       sv_player->v->ammo_cells = v;
                        }
                }
-        break;         
-    }
+               break;
+       }
 }
 
 edict_t        *FindViewthing (void)
 {
        int             i;
        edict_t *e;
-       
+
        for (i=0 ; i<sv.num_edicts ; i++)
        {
                e = EDICT_NUM(i);
-               if ( !strcmp (pr_strings + e->v.classname, "viewthing") )
+               if (!strcmp (PR_GetString(e->v->classname), "viewthing"))
                        return e;
        }
-       Con_Print("No viewthing on map\n");
+       Con_Print("No viewthing on map\n");
        return NULL;
 }
 
@@ -1470,15 +1562,15 @@ void Host_Viewmodel_f (void)
        if (!e)
                return;
 
-       m = Mod_ForName (Cmd_Argv(1), false);
+       m = Mod_ForName (Cmd_Argv(1), false, true, false);
        if (!m)
        {
-               Con_Printf ("Can't load %s\n", Cmd_Argv(1));
+               Con_Printf("Can't load %s\n", Cmd_Argv(1));
                return;
        }
-       
-       e->v.frame = 0;
-       cl.model_precache[(int)e->v.modelindex] = m;
+
+       e->v->frame = 0;
+       cl.model_precache[(int)e->v->modelindex] = m;
 }
 
 /*
@@ -1495,27 +1587,22 @@ void Host_Viewframe_f (void)
        e = FindViewthing ();
        if (!e)
                return;
-       m = cl.model_precache[(int)e->v.modelindex];
+       m = cl.model_precache[(int)e->v->modelindex];
 
        f = atoi(Cmd_Argv(1));
        if (f >= m->numframes)
                f = m->numframes-1;
 
-       e->v.frame = f;         
+       e->v->frame = f;
 }
 
 
 void PrintFrameName (model_t *m, int frame)
 {
-       aliashdr_t                      *hdr;
-       maliasframedesc_t       *pframedesc;
-
-       hdr = (aliashdr_t *)Mod_Extradata (m);
-       if (!hdr)
-               return;
-       pframedesc = &hdr->frames[frame];
-       
-       Con_Printf ("frame %i: %s\n", frame, pframedesc->name);
+       if (m->animscenes)
+               Con_Printf("frame %i: %s\n", frame, m->animscenes[frame].name);
+       else
+               Con_Printf("frame %i\n", frame);
 }
 
 /*
@@ -1527,17 +1614,17 @@ void Host_Viewnext_f (void)
 {
        edict_t *e;
        model_t *m;
-       
+
        e = FindViewthing ();
        if (!e)
                return;
-       m = cl.model_precache[(int)e->v.modelindex];
+       m = cl.model_precache[(int)e->v->modelindex];
 
-       e->v.frame = e->v.frame + 1;
-       if (e->v.frame >= m->numframes)
-               e->v.frame = m->numframes - 1;
+       e->v->frame = e->v->frame + 1;
+       if (e->v->frame >= m->numframes)
+               e->v->frame = m->numframes - 1;
 
-       PrintFrameName (m, e->v.frame);         
+       PrintFrameName (m, e->v->frame);
 }
 
 /*
@@ -1554,13 +1641,13 @@ void Host_Viewprev_f (void)
        if (!e)
                return;
 
-       m = cl.model_precache[(int)e->v.modelindex];
+       m = cl.model_precache[(int)e->v->modelindex];
 
-       e->v.frame = e->v.frame - 1;
-       if (e->v.frame < 0)
-               e->v.frame = 0;
+       e->v->frame = e->v->frame - 1;
+       if (e->v->frame < 0)
+               e->v->frame = 0;
 
-       PrintFrameName (m, e->v.frame);         
+       PrintFrameName (m, e->v->frame);
 }
 
 /*
@@ -1581,23 +1668,32 @@ void Host_Startdemos_f (void)
 {
        int             i, c;
 
-       if (cls.state == ca_dedicated)
+       if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
        {
                if (!sv.active)
-                       Cbuf_AddText ("map start\n");
+               {
+                       if (gamemode == GAME_TRANSFUSION)
+                               Cbuf_AddText ("map bb1\n");
+                       else
+                               Cbuf_AddText ("map start\n");
+               }
                return;
        }
 
        c = Cmd_Argc() - 1;
        if (c > MAX_DEMOS)
        {
-               Con_Printf ("Max %i demos in demoloop\n", MAX_DEMOS);
+               Con_Printf("Max %i demos in demoloop\n", MAX_DEMOS);
                c = MAX_DEMOS;
        }
-       Con_Printf ("%i demo(s) in loop\n", c);
+       Con_DPrintf("%i demo(s) in loop\n", c);
 
        for (i=1 ; i<c+1 ; i++)
-               strncpy (cls.demos[i-1], Cmd_Argv(i), sizeof(cls.demos[0])-1);
+               strlcpy (cls.demos[i-1], Cmd_Argv(i), sizeof (cls.demos[i-1]));
+
+       // LordHavoc: clear the remaining slots
+       for (;i <= MAX_DEMOS;i++)
+               cls.demos[i-1][0] = 0;
 
        if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
        {
@@ -1635,12 +1731,40 @@ Return to looping demos
 */
 void Host_Stopdemo_f (void)
 {
-       if (cls.state == ca_dedicated)
-               return;
        if (!cls.demoplayback)
                return;
-       CL_StopPlayback ();
        CL_Disconnect ();
+       Host_ShutdownServer (false);
+}
+
+static void MaxPlayers_f(void)
+{
+       int n;
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf("\"maxplayers\" is \"%u\"\n", svs.maxclients);
+               return;
+       }
+
+       if (sv.active)
+       {
+               Con_Print("maxplayers can not be changed while a server is running.\n");
+               return;
+       }
+
+       n = atoi(Cmd_Argv(1));
+       n = bound(1, n, MAX_SCOREBOARD);
+       Con_Printf("\"maxplayers\" set to \"%u\"\n", n);
+
+       if (svs.clients)
+               Mem_Free(svs.clients);
+       svs.maxclients = n;
+       svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients);
+       if (n == 1)
+               Cvar_Set ("deathmatch", "0");
+       else
+               Cvar_Set ("deathmatch", "1");
 }
 
 //=============================================================================
@@ -1654,7 +1778,7 @@ void Host_InitCommands (void)
 {
        Cmd_AddCommand ("status", Host_Status_f);
        Cmd_AddCommand ("quit", Host_Quit_f);
-       if (nehahra)
+       if (gamemode == GAME_NEHAHRA)
        {
                Cmd_AddCommand ("max", Host_God_f);
                Cmd_AddCommand ("monster", Host_Notarget_f);
@@ -1675,20 +1799,12 @@ void Host_InitCommands (void)
        Cmd_AddCommand ("changelevel", Host_Changelevel_f);
        Cmd_AddCommand ("connect", Host_Connect_f);
        Cmd_AddCommand ("reconnect", Host_Reconnect_f);
-       Cmd_AddCommand ("name", Host_Name_f);
        Cmd_AddCommand ("version", Host_Version_f);
-#ifdef IDGODS
-       Cmd_AddCommand ("please", Host_Please_f);
-#endif
        Cmd_AddCommand ("say", Host_Say_f);
        Cmd_AddCommand ("say_team", Host_Say_Team_f);
        Cmd_AddCommand ("tell", Host_Tell_f);
-       Cmd_AddCommand ("color", Host_Color_f);
        Cmd_AddCommand ("kill", Host_Kill_f);
        Cmd_AddCommand ("pause", Host_Pause_f);
-       Cmd_AddCommand ("spawn", Host_Spawn_f);
-       Cmd_AddCommand ("begin", Host_Begin_f);
-       Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
        Cmd_AddCommand ("kick", Host_Kick_f);
        Cmd_AddCommand ("ping", Host_Ping_f);
        Cmd_AddCommand ("load", Host_Loadgame_f);
@@ -1703,5 +1819,22 @@ void Host_InitCommands (void)
        Cmd_AddCommand ("viewnext", Host_Viewnext_f);
        Cmd_AddCommand ("viewprev", Host_Viewprev_f);
 
-       Cmd_AddCommand ("mcache", Mod_Print);
+       Cvar_RegisterVariable (&cl_name);
+       Cmd_AddCommand ("name", Host_Name_f);
+       Cvar_RegisterVariable (&cl_color);
+       Cmd_AddCommand ("color", Host_Color_f);
+       Cvar_RegisterVariable (&cl_rate);
+       Cmd_AddCommand ("rate", Host_Rate_f);
+       if (gamemode == GAME_NEHAHRA)
+       {
+               Cvar_RegisterVariable (&cl_pmodel);
+               Cmd_AddCommand ("pmodel", Host_PModel_f);
+       }
+       Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
+       Cmd_AddCommand ("spawn", Host_Spawn_f);
+       Cmd_AddCommand ("begin", Host_Begin_f);
+       Cmd_AddCommand ("maxplayers", MaxPlayers_f);
+
+       Cvar_RegisterVariable(&sv_cheats);
 }
+