changed sv.time to realtime in name change time limit code

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index 9307316d00cc615971d2824362db26b868541b98..d60489b35b390b0ee4c709b7f9e3a7b0a22291a3 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -269,29 +269,6 @@ void Host_Map_f (void)
        SV_SpawnServer(level);
        if (sv.active && cls.state == ca_disconnected)
                CL_EstablishConnection("local:1");
-
-#ifdef AUTODEMO_BROKEN
-// if cl_autodemo is set, automatically start recording a demo if one isn't being recorded already
-       if (cl_autodemo.integer && !cls.demorecording)
-       {
-               char demofile[MAX_OSPATH];
-
-               dpsnprintf (demofile, sizeof(demofile), "%s_%s.dem", Sys_TimeString (cl_autodemo_nameformat.string), level);
-
-               Con_Printf ("Recording to %s.\n", demofile);
-
-               cls.demofile = FS_Open (demofile, "wb", false, false);
-               if (cls.demofile)
-               {
-                       cls.forcetrack = -1;
-                       FS_Printf (cls.demofile, "%i\n", cls.forcetrack);
-               }
-               else
-                       Con_Print ("ERROR: couldn't open.\n");
-
-               cls.demorecording = true;
-       }
-#endif
 }
 
 /*
@@ -781,17 +758,16 @@ void Host_Name_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_name", newName);
-               CL_SetInfo("name", newName, true, false, false, false);
                return;
        }
 
-       if (sv.time < host_client->nametime)
+       if (realtime < host_client->nametime)
        {
                SV_ClientPrintf("You can't change name more than once every 5 seconds!\n");
                return;
        }
 
-       host_client->nametime = sv.time + 5;
+       host_client->nametime = realtime + 5;
 
        // point the string back at updateclient->name to keep it safe
        strlcpy (host_client->name, newName, sizeof (host_client->name));
@@ -839,18 +815,17 @@ void Host_Playermodel_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_playermodel", newPath);
-               CL_SetInfo("playermodel", newPath, true, false, false, false);
                return;
        }
 
        /*
-       if (sv.time < host_client->nametime)
+       if (realtime < host_client->nametime)
        {
                SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
                return;
        }
 
-       host_client->nametime = sv.time + 5;
+       host_client->nametime = realtime + 5;
        */
 
        // point the string back at updateclient->name to keep it safe
@@ -897,18 +872,17 @@ void Host_Playerskin_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_playerskin", newPath);
-               CL_SetInfo("playerskin", newPath, true, false, false, false);
                return;
        }
 
        /*
-       if (sv.time < host_client->nametime)
+       if (realtime < host_client->nametime)
        {
                SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
                return;
        }
 
-       host_client->nametime = sv.time + 5;
+       host_client->nametime = realtime + 5;
        */
 
        // point the string back at updateclient->name to keep it safe
@@ -970,8 +944,10 @@ void Host_Say(qboolean teamonly)
                p1++;
        }
        // note this uses the chat prefix \001
-       if (!fromServer)
+       if (!fromServer && !teamonly)
                dpsnprintf (text, sizeof(text), "\001%s" STRING_COLOR_DEFAULT_STR ": %s", host_client->name, p1);
+       else if (!fromServer && teamonly)
+               dpsnprintf (text, sizeof(text), "\001(%s" STRING_COLOR_DEFAULT_STR "): %s", host_client->name, p1);
        else if(*(sv_adminnick.string))
                dpsnprintf (text, sizeof(text), "\001<%s" STRING_COLOR_DEFAULT_STR "> %s", sv_adminnick.string, p1);
        else
@@ -1167,15 +1143,6 @@ void Host_Color(int changetop, int changebottom)
        if (cmd_source == src_command)
        {
                Cvar_SetValueQuick(&cl_color, playercolor);
-               if (changetop >= 0)
-                       CL_SetInfo("topcolor", va("%i", top), true, false, false, false);
-               if (changebottom >= 0)
-                       CL_SetInfo("bottomcolor", va("%i", bottom), true, false, false, false);
-               if (cls.protocol != PROTOCOL_QUAKEWORLD && cls.netcon)
-               {
-                       MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
-                       MSG_WriteString(&cls.netcon->message, va("color %i %i", top, bottom));
-               }
                return;
        }
 
@@ -1273,7 +1240,6 @@ void Host_Rate_f(void)
        if (cmd_source == src_command)
        {
                Cvar_SetValue ("_cl_rate", max(NET_MINRATE, rate));
-               CL_SetInfo("rate", va("%i", rate), true, false, false, false);
                return;
        }
 
@@ -1434,7 +1400,7 @@ void Host_Spawn_f (void)
                prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
                PRVM_ExecuteProgram (prog->globals.server->ClientConnect, "QC function ClientConnect is missing");
 
-               if ((Sys_DoubleTime() - host_client->connecttime) <= sv.time)
+               if (svs.maxclients > 1 || cls.state == ca_dedicated)
                        Con_Printf("%s entered the game\n", host_client->name);
 
                PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing");
@@ -2469,7 +2435,7 @@ void Host_InitCommands (void)
        Cmd_AddCommand_WithClientCommand ("begin", NULL, Host_Begin_f, "signon 3 (client asks server to start sending entities, and will go to signon 4 (playing) when the first entity update is received)");
        Cmd_AddCommand ("maxplayers", MaxPlayers_f, "sets limit on how many players (or bots) may be connected to the server at once");
 
-       Cmd_AddCommand ("sendcvar", Host_SendCvar_f, "sends the value of a cvar to the server as a sentcvar command, for use by QuakeC");       // By [515]
+       Cmd_AddCommand ("sendcvar", Host_SendCvar_f, "sends the value of a cvar to the server as a sentcvar command, for use by QuakeC");
 
        Cvar_RegisterVariable (&rcon_password);
        Cvar_RegisterVariable (&rcon_address);