]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - host_cmd.c
map and load commands are now delayed until the video system is started, this fixes...
[xonotic/darkplaces.git] / host_cmd.c
index c949589c1949640704726868c6dab1aefdebd24d..6a648c380c6413861f6780682994ae1ef329fbfe 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,9 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-int    current_skill;
-
-void Mod_Print (void);
+int current_skill;
+char sv_spawnmap[MAX_QPATH];
+char sv_loadgame[MAX_OSPATH];
 
 dfunction_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,10 @@ Host_Status_f
 */
 void Host_Status_f (void)
 {
-       client_t        *client;
-       int                     seconds;
-       int                     minutes;
-       int                     hours = 0;
-       int                     j;
-       void            (*print) (char *fmt, ...);
-       
+       client_t *client;
+       int seconds, minutes, hours = 0, j;
+       void (*print) (const char *fmt, ...);
+
        if (cmd_source == src_command)
        {
                if (!sv.active)
@@ -78,7 +67,7 @@ void Host_Status_f (void)
                print = SV_ClientPrintf;
 
        print ("host:    %s\n", Cvar_VariableString ("hostname"));
-       print ("version: %4.2f (build %i)\n", VERSION, buildnumber);
+       print ("version: %s build %s\n", gamename, buildstring);
        if (tcpipAvailable)
                print ("tcp/ip:  %s\n", my_tcpip_address);
        if (ipxAvailable)
@@ -246,59 +235,31 @@ 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];
-
        if (cmd_source != src_command)
                return;
 
        cls.demonum = -1;               // stop demo loop in case this fails
 
-//     SCR_BeginLoadingPlaque ();
+       SCR_BeginLoadingPlaque ();
 
        CL_Disconnect ();
-       Host_ShutdownServer(false);             
+       Host_ShutdownServer(false);
 
        key_dest = key_game;                    // remove console or menu
 
-       cls.mapstring[0] = 0;
-       for (i=0 ; i<Cmd_Argc() ; i++)
-       {
-               strcat (cls.mapstring, Cmd_Argv(i));
-               strcat (cls.mapstring, " ");
-       }
-       strcat (cls.mapstring, "\n");
-
        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);
-       }       
+       strcpy (sv_spawnmap, Cmd_Argv(1));
 }
 
 /*
@@ -310,8 +271,6 @@ Goes to a new map, taking all clients along
 */
 void Host_Changelevel_f (void)
 {
-       char    level[MAX_QPATH];
-
        if (Cmd_Argc() != 2)
        {
                Con_Printf ("changelevel <levelname> : continue game on a new level\n");
@@ -323,8 +282,7 @@ void Host_Changelevel_f (void)
                return;
        }
        SV_SaveSpawnparms ();
-       strcpy (level, Cmd_Argv(1));
-       SV_SpawnServer (level);
+       strcpy (sv_spawnmap, Cmd_Argv(1));
 }
 
 /*
@@ -336,16 +294,12 @@ Restarts the current server for a dead player
 */
 void Host_Restart_f (void)
 {
-       char    mapname[MAX_QPATH];
-
        if (cls.demoplayback || !sv.active)
                return;
 
        if (cmd_source != src_command)
                return;
-       strcpy (mapname, sv.name);      // must copy out, because it gets cleared
-                                                               // in sv_spawnserver
-       SV_SpawnServer (mapname);
+       strcpy (sv_spawnmap, sv.name);
 }
 
 /*
@@ -358,7 +312,7 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
-//     SCR_BeginLoadingPlaque ();
+       SCR_BeginLoadingPlaque ();
        cls.signon = 0;         // need new connection messages
 }
 
@@ -371,14 +325,11 @@ User command to connect to server
 */
 void Host_Connect_f (void)
 {
-       char    name[MAX_QPATH];
-       
+       char name[MAX_QPATH];
+
        cls.demonum = -1;               // stop demo loop in case this fails
        if (cls.demoplayback)
-       {
-               CL_StopPlayback ();
                CL_Disconnect ();
-       }
        strcpy (name, Cmd_Argv(1));
        CL_EstablishConnection (name);
        Host_Reconnect_f ();
@@ -399,7 +350,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)
@@ -464,7 +415,7 @@ void Host_Savegame_f (void)
                Con_Printf ("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) )
@@ -476,7 +427,7 @@ void Host_Savegame_f (void)
 
        sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
        COM_DefaultExtension (name, ".sav");
-       
+
        Con_Printf ("Saving game to %s...\n", name);
        f = Qopen (name, "w");
        if (!f)
@@ -484,7 +435,7 @@ void Host_Savegame_f (void)
                Con_Printf ("ERROR: couldn't open.\n");
                return;
        }
-       
+
        Qprintf (f, "%i\n", SAVEGAME_VERSION);
        Host_SavegameComment (comment);
        Qprintf (f, "%s\n", comment);
@@ -516,6 +467,8 @@ void Host_Savegame_f (void)
 }
 
 
+extern mempool_t *edictstring_mempool;
+
 /*
 ===============
 Host_Loadgame_f
@@ -523,18 +476,6 @@ Host_Loadgame_f
 */
 void Host_Loadgame_f (void)
 {
-       char    name[MAX_OSPATH];
-       QFile   *f;
-       char    mapname[MAX_QPATH];
-       float   time, tfloat;
-       char    buf[32768], *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;
 
@@ -544,17 +485,28 @@ void Host_Loadgame_f (void)
                return;
        }
 
-       cls.demonum = -1;               // stop demo loop in case this fails
+       sprintf (sv_loadgame, "%s/%s", com_gamedir, Cmd_Argv(1));
+       COM_DefaultExtension (sv_loadgame, ".sav");
 
-       sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
-       COM_DefaultExtension (name, ".sav");
+       Con_Printf ("Loading game from %s...\n", sv_loadgame);
+}
+
+void Host_PerformLoadGame(char *name)
+{
+       QFile *f;
+       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];
 
-       // LordHavoc: made SCR_UpdateScreen use a great deal less stack space, no longer an issue
-       //// we can't call SCR_BeginLoadingPlaque, because too much stack space has
-       //// been used.  The menu calls it before stuffing loadgame command
-//     SCR_BeginLoadingPlaque ();
+       cls.demonum = -1;               // stop demo loop in case this fails
 
-       Con_Printf ("Loading game from %s...\n", name);
        f = Qopen (name, "rz");
        if (!f)
        {
@@ -570,8 +522,12 @@ void Host_Loadgame_f (void)
                Con_Printf ("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
                return;
        }
+
+       SCR_BeginLoadingPlaque ();
+
        str = Qgetline (f);
-       for (i=0 ; i<NUM_SPAWN_PARMS ; i++) {
+       for (i = 0;i < NUM_SPAWN_PARMS;i++)
+       {
                str = Qgetline (f);
                sscanf (str, "%f\n", &spawn_parms[i]);
        }
@@ -582,11 +538,12 @@ void Host_Loadgame_f (void)
        Cvar_SetValue ("skill", (float)current_skill);
 
        strcpy (mapname, Qgetline (f));
+
        str = Qgetline (f);
        sscanf (str, "%f\n",&time);
 
        CL_Disconnect_f ();
-       
+
        SV_SpawnServer (mapname);
        if (!sv.active)
        {
@@ -598,18 +555,19 @@ void Host_Loadgame_f (void)
 
 // load the light styles
 
-       for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
+       for (i = 0;i < MAX_LIGHTSTYLES;i++)
        {
                str = Qgetline (f);
-               sv.lightstyles[i] = Hunk_AllocName (strlen(str)+1, "lightstyles");
+               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
+       // -1 is the globals
+       entnum = -1;
        while (!Qeof(f))
        {
-               for (i=0 ; i<sizeof(buf)-1 ; i++)
+               for (i = 0;i < sizeof(buf) - 1;i++)
                {
                        r = Qgetc (f);
                        if (r == EOF || !r)
@@ -622,41 +580,44 @@ void Host_Loadgame_f (void)
                        }
                }
                if (i == sizeof(buf)-1)
-                       Sys_Error ("Loadgame buffer overflow");
+                       Host_Error ("Loadgame buffer overflow");
                buf[i] = 0;
                start = buf;
-               start = COM_Parse(buf);
-               if (!com_token[0])
-                       break;          // end of file
+               if (!COM_ParseToken(&start))
+               {
+                       // 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
                        ent = EDICT_NUM(entnum);
                        memset (&ent->v, 0, progs->entityfields * 4);
                        ent->free = false;
                        ED_ParseEdict (start, ent);
-       
-               // link it into the bsp tree
+
+                       // link it into the bsp tree
                        if (!ent->free)
                                SV_LinkEdict (ent, false);
                }
 
                entnum++;
        }
-       
+
        sv.num_edicts = entnum;
        sv.time = time;
 
        Qclose (f);
 
-       for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
+       for (i = 0;i < NUM_SPAWN_PARMS;i++)
                svs.clients->spawn_parms[i] = spawn_parms[i];
 
        if (cls.state != ca_dedicated)
@@ -675,17 +636,18 @@ Host_Name_f
 */
 void Host_Name_f (void)
 {
-       char    *newName;
+       char newName[64];
 
        if (Cmd_Argc () == 1)
        {
                Con_Printf ("\"name\" is \"%s\"\n", cl_name.string);
                return;
        }
+
        if (Cmd_Argc () == 2)
-               newName = Cmd_Argv(1);  
+               strncpy(newName, Cmd_Argv(1), 15);
        else
-               newName = Cmd_Args();
+               strncpy(newName, Cmd_Args(), 15);
        newName[15] = 0;
 
        if (cmd_source == src_command)
@@ -703,30 +665,29 @@ void Host_Name_f (void)
                        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
-       
+
        MSG_WriteByte (&sv.reliable_datagram, svc_updatename);
        MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
        MSG_WriteString (&sv.reliable_datagram, host_client->name);
 }
 
-       
+
 void Host_Version_f (void)
 {
-       Con_Printf ("Version %4.2f (build %i)\n", VERSION, buildnumber);
-       Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
+       Con_Printf ("Version: %s build %s\n", gamename, buildstring);
 }
 
 void Host_Say(qboolean teamonly)
 {
        client_t *client;
        client_t *save;
-       int             j;
-       char    *p;
+       int j;
+       const char *p1, *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)
        {
@@ -745,34 +706,40 @@ void Host_Say(qboolean teamonly)
        if (Cmd_Argc () < 2)
                return;
 
-       save = host_client;
-
-       p = Cmd_Args();
-// remove quotes if present
-       if (*p == '"')
-       {
-               p++;
-               p[strlen(p)-1] = 0;
-       }
-
 // turn on color set 1
        if (!fromServer)
-               sprintf (text, "%c%s: ", 1, save->name);
+               sprintf (text, "%c%s: ", 1, host_client->name);
        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;
+       save = host_client;
 
-       strcat (text, p);
-       strcat (text, "\n");
+       p1 = Cmd_Args();
+       p2 = p1 + strlen(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
+                       Con_Printf("Host_Say: missing end quote\n");
+       }
+       while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+               p2--;
+       for (j = strlen(text);j < (sizeof(text) - 2) && p1 < p2;)
+               text[j++] = *p1++;
+       text[j++] = '\n';
+       text[j++] = 0;
 
        for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
        {
                if (!client || !client->active || !client->spawned)
                        continue;
-               if (teamplay.value && teamonly && client->edict->v.team != save->edict->v.team)
+               if (teamplay.integer && teamonly && client->edict->v.team != save->edict->v.team)
                        continue;
                host_client = client;
                SV_ClientPrintf("%s", text);
@@ -799,38 +766,55 @@ void Host_Tell_f(void)
 {
        client_t *client;
        client_t *save;
-       int             j;
-       char    *p;
-       char    text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 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
+                       Con_Printf("Host_Say: 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 < (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++)
@@ -858,11 +842,11 @@ void Host_Color_f(void)
        int             playercolor;
        dfunction_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_Printf ("color <0-15> [0-15]\n");
                return;
        }
 
@@ -873,7 +857,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)
@@ -882,7 +866,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)
@@ -893,12 +877,11 @@ void Host_Color_f(void)
                return;
        }
 
-       // void(float color) SV_ChangeTeam;
        if ((f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
        {
                Con_DPrintf("Calling SV_ChangeTeam\n");
                pr_global_struct->time = sv.time;
-               pr_globals[0] = playercolor;
+               pr_globals[OFS_PARM0] = playercolor;
                pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
                PR_ExecuteProgram (SV_ChangeTeam, "");
        }
@@ -932,7 +915,7 @@ void Host_Kill_f (void)
                SV_ClientPrintf ("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, "QC function ClientKill is missing");
@@ -952,7 +935,7 @@ void Host_Pause_f (void)
                Cmd_ForwardToServer ();
                return;
        }
-       if (!pausable.value)
+       if (!pausable.integer)
                SV_ClientPrintf ("Pause not allowed.\n");
        else
        {
@@ -1032,7 +1015,8 @@ void Host_Spawn_f (void)
 
 // run the entrance script
        if (sv.loadgame)
-       {       // loaded games are fully inited already
+       {
+               // loaded games are fully initialized already
                // if this is the last client to be connected, unpause
                sv.paused = false;
 
@@ -1092,7 +1076,7 @@ void Host_Spawn_f (void)
                MSG_WriteByte (&host_client->message, i);
                MSG_WriteByte (&host_client->message, client->colors);
        }
-       
+
 // send all current light styles
        for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
        {
@@ -1120,7 +1104,6 @@ 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
@@ -1167,11 +1150,11 @@ 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)
        {
@@ -1210,10 +1193,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;
 
@@ -1223,7 +1208,8 @@ void Host_Kick_f (void)
 
                if (Cmd_Argc() > 2)
                {
-                       message = COM_Parse(Cmd_Args());
+                       message = Cmd_Args();
+                       COM_ParseToken(&message);
                        if (byNumber)
                        {
                                message++;                                                      // skip the #
@@ -1259,9 +1245,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)
        {
@@ -1274,58 +1260,58 @@ void Host_Give_f (void)
 
        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'));
-      }
+       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 (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 's':
+               if (gamemode == GAME_ROGUE)
                {
-                   if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
-                           val->_float = v;
+                       if ((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;
+                               val->_float = v;
                                if (sv_player->v.weapon <= IT_LIGHTNING)
                                        sv_player->v.ammo_nails = v;
                        }
@@ -1334,9 +1320,9 @@ void Host_Give_f (void)
                {
                        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)
@@ -1346,9 +1332,9 @@ void Host_Give_f (void)
                                        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)
@@ -1362,9 +1348,9 @@ void Host_Give_f (void)
                {
                        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)
@@ -1374,12 +1360,12 @@ void Host_Give_f (void)
                                        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)
@@ -1393,9 +1379,9 @@ void Host_Give_f (void)
                {
                        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)
@@ -1405,15 +1391,15 @@ void Host_Give_f (void)
                                        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);
@@ -1438,7 +1424,7 @@ 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));
@@ -1475,10 +1461,8 @@ void Host_Viewframe_f (void)
 
 void PrintFrameName (model_t *m, int frame)
 {
-       int data;
-       data = (int) Mod_Extradata(m);
-       if (m->ofs_scenes && data)
-               Con_Printf("frame %i: %s\n", frame, ((animscene_t *) (m->ofs_scenes + data))[frame].name);
+       if (m->animscenes)
+               Con_Printf("frame %i: %s\n", frame, m->animscenes[frame].name);
        else
                Con_Printf("frame %i\n", frame);
 }
@@ -1600,14 +1584,29 @@ Return to looping demos
 */
 void Host_Stopdemo_f (void)
 {
-       if (cls.state == ca_dedicated)
-               return;
        if (!cls.demoplayback)
                return;
-       CL_StopPlayback ();
        CL_Disconnect ();
 }
 
+// LordHavoc: because we don't want to load things before the video starts,
+// we have to delay map and game loads until AFTER video is initialized
+void Host_PerformSpawnServerAndLoadGame(void)
+{
+       if (vid_hidden)
+               return;
+       if (sv_loadgame[0])
+               Host_PerformLoadGame(sv_loadgame);
+       else if (sv_spawnmap[0])
+       {
+               SV_SpawnServer(sv_spawnmap);
+               if (sv.active && cls.state != ca_dedicated)
+                       Cmd_ExecuteString ("connect local", src_command);
+       }
+       sv_loadgame[0] = 0;
+       sv_spawnmap[0] = 0;
+}
+
 //=============================================================================
 
 /*
@@ -1619,7 +1618,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);
@@ -1664,6 +1663,5 @@ void Host_InitCommands (void)
        Cmd_AddCommand ("viewframe", Host_Viewframe_f);
        Cmd_AddCommand ("viewnext", Host_Viewnext_f);
        Cmd_AddCommand ("viewprev", Host_Viewprev_f);
-
-       Cmd_AddCommand ("mcache", Mod_Print);
 }
+