added buildnumber.c to makefile

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index d70508ef5602f99a1c12fa8cefb65816b0818329..5f0ab5fb2a0d428bab9eb7fc6593faae3b76a0e7 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);             
 
@@ -118,7 +121,7 @@ void Host_God_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (pr_global_struct->deathmatch)
                return;
 
        sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE;
@@ -136,7 +139,7 @@ void Host_Notarget_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (pr_global_struct->deathmatch)
                return;
 
        sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET;
@@ -156,7 +159,7 @@ void Host_Noclip_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (pr_global_struct->deathmatch)
                return;
 
        if (sv_player->v.movetype != MOVETYPE_NOCLIP)
@@ -188,7 +191,7 @@ void Host_Fly_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (pr_global_struct->deathmatch)
                return;
 
        if (sv_player->v.movetype != MOVETYPE_FLY)
@@ -707,59 +710,6 @@ void Host_Version_f (void)
        Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
 }
 
-#ifdef IDGODS
-void Host_Please_f (void)
-{
-       client_t *cl;
-       int                     j;
-       
-       if (cmd_source != src_command)
-               return;
-
-       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;
-       }
-
-       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;
-               }
-       }
-}
-#endif
-
-
 void Host_Say(qboolean teamonly)
 {
        client_t *client;
@@ -1056,14 +1006,18 @@ void Host_Spawn_f (void)
                return;
        }
 
+       // 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
                // 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");
                        pr_global_struct->time = sv.time;
@@ -1073,6 +1027,7 @@ void Host_Spawn_f (void)
        }
        else
        {
+               eval_t *val;
                // set up the edict
                ent = host_client->edict;
 
@@ -1080,6 +1035,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
 
@@ -1099,9 +1056,6 @@ void Host_Spawn_f (void)
        }
 
 
-// send all current names, colors, and frag counts
-       SZ_Clear (&host_client->message);
-
 // send time of update
        MSG_WriteByte (&host_client->message, svc_time);
        MSG_WriteFloat (&host_client->message, sv.time);
@@ -1207,7 +1161,7 @@ void Host_Kick_f (void)
                        return;
                }
        }
-       else if (pr_global_struct->deathmatch && !host_client->privileged)
+       else if (pr_global_struct->deathmatch)
                return;
 
        save = host_client;
@@ -1295,7 +1249,7 @@ void Host_Give_f (void)
                return;
        }
 
-       if (pr_global_struct->deathmatch && !host_client->privileged)
+       if (pr_global_struct->deathmatch)
                return;
 
        t = Cmd_Argv(1);
@@ -1340,7 +1294,7 @@ void Host_Give_f (void)
     case 's':
                if (rogue)
                {
-                   if (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))
+                   if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
                            val->_float = v;
                }
 
@@ -1349,7 +1303,7 @@ void Host_Give_f (void)
     case 'n':
                if (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)
@@ -1637,35 +1591,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;
-}
-
 //=============================================================================
 
 /*
@@ -1700,9 +1625,6 @@ void Host_InitCommands (void)
        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);
@@ -1716,7 +1638,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);