]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sv_ccmds.c
Fix compile warnings from gcc and g++
[xonotic/darkplaces.git] / sv_ccmds.c
index f6bb0a67230eb2050f61a05d3a7c0695b9f3b253..c5a6fdf8514ff6ba42ed8dbd5b7cc30a3941cdeb 100644 (file)
@@ -18,10 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include <quakedef.h>
-#include <utf8lib.h>
-#include <server.h>
-#include <sv_demo.h>
+#include "quakedef.h"
+#include "utf8lib.h"
+#include "server.h"
+#include "sv_demo.h"
 
 int current_skill;
 cvar_t sv_cheats = {CVAR_SERVER | CVAR_NOTIFY, "sv_cheats", "0", "enables cheat commands in any game, and cheat impulses in dpmod"};
@@ -104,9 +104,10 @@ static void SV_Changelevel_f(cmd_state_t *cmd)
                Con_Print("changelevel <levelname> : continue game on a new level\n");
                return;
        }
-       // HACKHACKHACK
-       if (!sv.active) {
-               SV_Map_f(cmd);
+
+       if (!sv.active)
+       {
+               Con_Printf("You must be running a server to changelevel. Use 'map %s' instead\n", Cmd_Argv(cmd, 1));
                return;
        }
 
@@ -162,12 +163,12 @@ static void SV_Restart_f(cmd_state_t *cmd)
 //===========================================================================
 
 // Disable cheats if sv_cheats is turned off
-static void SV_DisableCheats_c(char *value)
+static void SV_DisableCheats_c(cvar_t *var)
 {
        prvm_prog_t *prog = SVVM_prog;
        int i = 0;
 
-       if (value[0] == '0' && !value[1])
+       if (var->value == 0)
        {
                while (svs.clients[i].edict)
                {
@@ -412,7 +413,7 @@ static void SV_Pause_f(cmd_state_t *cmd)
                // if running a client, try to send over network so the pause is handled by the server
                if (cls.state == ca_connected)
                {
-                       Cmd_ForwardToServer_f(cmd);
+                       CL_ForwardToServer_f(cmd);
                        return;
                }
                print = Con_Printf;
@@ -464,7 +465,7 @@ static void SV_Say(cmd_state_t *cmd, qboolean teamonly)
                }
                else
                {
-                       Cmd_ForwardToServer_f(cmd);
+                       CL_ForwardToServer_f(cmd);
                        return;
                }
        }
@@ -539,7 +540,7 @@ static void SV_Tell_f(cmd_state_t *cmd)
                        fromServer = true;
                else
                {
-                       Cmd_ForwardToServer_f(cmd);
+                       CL_ForwardToServer_f(cmd);
                        return;
                }
        }
@@ -667,7 +668,7 @@ static void SV_Ping_f(cmd_state_t *cmd)
                // if running a client, try to send over network so the client's ping report parser will see the report
                if (cls.state == ca_connected)
                {
-                       Cmd_ForwardToServer_f(cmd);
+                       CL_ForwardToServer_f(cmd);
                        return;
                }
                print = Con_Printf;
@@ -825,15 +826,7 @@ static void SV_Status_f(cmd_state_t *cmd)
        char vabuf[1024];
 
        if (cmd->source == src_command)
-       {
-               // if running a client, try to send over network so the client's status report parser will see the report
-               if (cls.state == ca_connected)
-               {
-                       Cmd_ForwardToServer_f(cmd);
-                       return;
-               }
                print = Con_Printf;
-       }
        else
                print = SV_ClientPrintf;
 
@@ -894,7 +887,7 @@ static void SV_Status_f(cmd_state_t *cmd)
                        ping = bound(0, (int)floor(client->ping*1000+0.5), 9999);
                }
 
-               if(sv_status_privacy.integer && cmd->source != src_command)
+               if(sv_status_privacy.integer && cmd->source != src_command && LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP)
                        strlcpy(ip, client->netconnection ? "hidden" : "botclient", 48);
                else
                        strlcpy(ip, (client->netconnection && *client->netconnection->address) ? client->netconnection->address : "botclient", 48);
@@ -1094,6 +1087,9 @@ static void SV_Color_f(cmd_state_t *cmd)
        top = atoi(Cmd_Argv(cmd, 1));
        bottom = atoi(Cmd_Argv(cmd, 2));
 
+       top &= 15;
+       bottom &= 15;
+
        playercolor = top*16 + bottom;
 
        if (host_client->edict && PRVM_serverfunction(SV_ChangeTeam))
@@ -1168,7 +1164,7 @@ static void SV_Kick_f(cmd_state_t *cmd)
                        if (cls.state == ca_dedicated)
                                who = "Console";
                        else
-                               who = name.string;
+                               who = cl_name.string;
                }
                else
                        who = save->name;
@@ -1228,6 +1224,120 @@ static void SV_MaxPlayers_f(cmd_state_t *cmd)
                Cvar_Set (&cvars_all, "deathmatch", "1");
 }
 
+/*
+======================
+SV_Playermodel_f
+======================
+*/
+// the old playermodel in cl_main has been renamed to __cl_playermodel
+static void SV_Playermodel_f(cmd_state_t *cmd)
+{
+       prvm_prog_t *prog = SVVM_prog;
+       int i, j;
+       char newPath[sizeof(host_client->playermodel)];
+
+       if (Cmd_Argc (cmd) == 1)
+               return;
+
+       if (Cmd_Argc (cmd) == 2)
+               strlcpy (newPath, Cmd_Argv(cmd, 1), sizeof (newPath));
+       else
+               strlcpy (newPath, Cmd_Args(cmd), sizeof (newPath));
+
+       for (i = 0, j = 0;newPath[i];i++)
+               if (newPath[i] != '\r' && newPath[i] != '\n')
+                       newPath[j++] = newPath[i];
+       newPath[j] = 0;
+
+       /*
+       if (host.realtime < host_client->nametime)
+       {
+               SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
+               return;
+       }
+
+       host_client->nametime = host.realtime + 5;
+       */
+
+       // point the string back at updateclient->name to keep it safe
+       strlcpy (host_client->playermodel, newPath, sizeof (host_client->playermodel));
+       PRVM_serveredictstring(host_client->edict, playermodel) = PRVM_SetEngineString(prog, host_client->playermodel);
+       if (strcmp(host_client->old_model, host_client->playermodel))
+       {
+               strlcpy(host_client->old_model, host_client->playermodel, sizeof(host_client->old_model));
+               /*// send notification to all clients
+               MSG_WriteByte (&sv.reliable_datagram, svc_updatepmodel);
+               MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
+               MSG_WriteString (&sv.reliable_datagram, host_client->playermodel);*/
+       }
+}
+
+/*
+======================
+SV_Playerskin_f
+======================
+*/
+static void SV_Playerskin_f(cmd_state_t *cmd)
+{
+       prvm_prog_t *prog = SVVM_prog;
+       int i, j;
+       char newPath[sizeof(host_client->playerskin)];
+
+       if (Cmd_Argc (cmd) == 1)
+               return;
+
+       if (Cmd_Argc (cmd) == 2)
+               strlcpy (newPath, Cmd_Argv(cmd, 1), sizeof (newPath));
+       else
+               strlcpy (newPath, Cmd_Args(cmd), sizeof (newPath));
+
+       for (i = 0, j = 0;newPath[i];i++)
+               if (newPath[i] != '\r' && newPath[i] != '\n')
+                       newPath[j++] = newPath[i];
+       newPath[j] = 0;
+
+       /*
+       if (host.realtime < host_client->nametime)
+       {
+               SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
+               return;
+       }
+
+       host_client->nametime = host.realtime + 5;
+       */
+
+       // point the string back at updateclient->name to keep it safe
+       strlcpy (host_client->playerskin, newPath, sizeof (host_client->playerskin));
+       PRVM_serveredictstring(host_client->edict, playerskin) = PRVM_SetEngineString(prog, host_client->playerskin);
+       if (strcmp(host_client->old_skin, host_client->playerskin))
+       {
+               //if (host_client->begun)
+               //      SV_BroadcastPrintf("%s changed skin to %s\n", host_client->name, host_client->playerskin);
+               strlcpy(host_client->old_skin, host_client->playerskin, sizeof(host_client->old_skin));
+               /*// send notification to all clients
+               MSG_WriteByte (&sv.reliable_datagram, svc_updatepskin);
+               MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients);
+               MSG_WriteString (&sv.reliable_datagram, host_client->playerskin);*/
+       }
+}
+
+/*
+======================
+SV_PModel_f
+LadyHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
+LadyHavoc: correction, Mindcrime will be removing pmodel in the future, but it's still stuck here for compatibility.
+======================
+*/
+static void SV_PModel_f(cmd_state_t *cmd)
+{
+       prvm_prog_t *prog = SVVM_prog;
+
+       if (Cmd_Argc (cmd) == 1)
+               return;
+
+       PRVM_serveredictfloat(host_client->edict, pmodel) = atoi(Cmd_Argv(cmd, 1));
+}
+
 /*
 ===============================================================================
 
@@ -1369,6 +1479,34 @@ static void SV_Viewprev_f(cmd_state_t *cmd)
        }
 }
 
+static void SV_SendCvar_f(cmd_state_t *cmd)
+{
+       int i;  
+       const char *cvarname;
+       client_t *old;
+       
+       if(Cmd_Argc(cmd) != 2)
+               return;
+
+       if(!sv.active)// || !PRVM_serverfunction(SV_ParseClientCommand))
+               return;
+
+       cvarname = Cmd_Argv(cmd, 1);
+
+       old = host_client;
+       if (cls.state != ca_dedicated)
+               i = 1;
+       else
+               i = 0;
+       for(;i<svs.maxclients;i++)
+               if(svs.clients[i].active && svs.clients[i].netconnection)
+               {
+                       host_client = &svs.clients[i];
+                       SV_ClientCommands("sendcvar %s\n", cvarname);
+               }
+       host_client = old;
+}
+
 void SV_InitOperatorCommands(void)
 {
        Cvar_RegisterVariable(&sv_cheats);
@@ -1397,6 +1535,7 @@ void SV_InitOperatorCommands(void)
        Cmd_AddCommand(CMD_SHARED, "maxplayers", SV_MaxPlayers_f, "sets limit on how many players (or bots) may be connected to the server at once");
        Cmd_AddCommand(CMD_SHARED, "user", SV_User_f, "prints additional information about a player number or name on the scoreboard");
        Cmd_AddCommand(CMD_SHARED, "users", SV_Users_f, "prints additional information about all players on the scoreboard");
+       Cmd_AddCommand(CMD_SERVER, "sendcvar", SV_SendCvar_f, "sends the value of a cvar to the server as a sentcvar command, for use by QuakeC");
 
        // commands that do not have automatic forwarding from cmd_client, these are internal details of the network protocol and not of interest to users (if they know what they are doing they can still use a generic "cmd prespawn" or similar)
        Cmd_AddCommand(CMD_SERVER_FROM_CLIENT, "prespawn", SV_PreSpawn_f, "internal use - signon 1 (client acknowledges that server information has been received)");
@@ -1415,4 +1554,7 @@ void SV_InitOperatorCommands(void)
        Cmd_AddCommand(CMD_USERINFO, "name", SV_Name_f, "change your player name");
        Cmd_AddCommand(CMD_USERINFO, "rate", SV_Rate_f, "change your network connection speed");
        Cmd_AddCommand(CMD_USERINFO, "rate_burstsize", SV_Rate_BurstSize_f, "change your network connection speed");
-}
\ No newline at end of file
+       Cmd_AddCommand(CMD_USERINFO, "pmodel", SV_PModel_f, "(Nehahra-only) change your player model choice");
+       Cmd_AddCommand(CMD_USERINFO, "playermodel", SV_Playermodel_f, "change your player model");
+       Cmd_AddCommand(CMD_USERINFO, "playerskin", SV_Playerskin_f, "change your player skin number");  
+}