misc. cleanup, bubble trails fixed, improved lightmap compatibility.

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index d70508ef5602f99a1c12fa8cefb65816b0818329..841ca3e86d883ff283d584a76db034c7757be8f8 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -32,15 +32,18 @@ Host_Quit_f
 ==================
 */
 
-extern void M_Menu_Quit_f (void);
+// LordHavoc: didn't like it asking me if I wanted to quit
+//extern void M_Menu_Quit_f (void);
 
 void Host_Quit_f (void)
 {
+       /*
        if (key_dest != key_console && cls.state != ca_dedicated)
        {
                M_Menu_Quit_f ();
                return;
        }
+       */
        CL_Disconnect ();
        Host_ShutdownServer(false);             
 
@@ -1073,6 +1076,7 @@ void Host_Spawn_f (void)
        }
        else
        {
+               eval_t *val;
                // set up the edict
                ent = host_client->edict;
 
@@ -1080,6 +1084,8 @@ void Host_Spawn_f (void)
                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;
 
                // copy spawn parms out of the client_t
 
@@ -1637,35 +1643,6 @@ void Host_Stopdemo_f (void)
        CL_Disconnect ();
 }
 
-/*
-======================
-Host_PModel_f
-LordHavoc: Intended for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
-======================
-*/
-void Host_PModel_f (void)
-{
-       int i;
-       eval_t *val;
-
-       if (Cmd_Argc () == 1)
-       {
-               Con_Printf ("usage: pmodel modelnumber\n");
-               return;
-       }
-       i = atoi(Cmd_Argv(1));
-
-       if (cmd_source == src_command)
-       {
-               if (cls.state == ca_connected)
-                       Cmd_ForwardToServer ();
-               return;
-       }
-
-       if (val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel))
-               val->_float = i;
-}
-
 //=============================================================================
 
 /*
@@ -1716,7 +1693,6 @@ void Host_InitCommands (void)
        Cmd_AddCommand ("ping", Host_Ping_f);
        Cmd_AddCommand ("load", Host_Loadgame_f);
        Cmd_AddCommand ("save", Host_Savegame_f);
-       Cmd_AddCommand ("pmodel", Host_PModel_f);
 
        Cmd_AddCommand ("startdemos", Host_Startdemos_f);
        Cmd_AddCommand ("demos", Host_Demos_f);