]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - host_cmd.c
renamed varray_ arrays to rsurface_array_, and they are no longer used outside the...
[xonotic/darkplaces.git] / host_cmd.c
index 98b7d090067f73effdda2a32dc1d21bbd0504f84..9bd58db01dec59540b4940a99657b89ab775d5a4 100644 (file)
@@ -371,22 +371,39 @@ This is sent just before a server changes levels
 */
 void Host_Reconnect_f (void)
 {
-       if (cmd_source == src_command)
-       {
-               Con_Print("reconnect is not valid from the console\n");
-               return;
-       }
-       if (Cmd_Argc() != 1)
+       if (cls.protocol == PROTOCOL_QUAKEWORLD)
        {
-               Con_Print("reconnect : wait for signon messages again\n");
-               return;
+               if (cls.qw_downloadmemory)  // don't change when downloading
+                       return;
+
+               S_StopAllSounds();
+
+               if (cls.netcon)
+               {
+                       if (cls.state == ca_connected && cls.signon < SIGNONS)
+                       {
+                               Con_Printf("reconnecting...\n");
+                               MSG_WriteChar(&cls.netcon->message, qw_clc_stringcmd);
+                               MSG_WriteString(&cls.netcon->message, "new");
+                       }
+                       else
+                               Con_Printf("Please use connect instead (reconnect not implemented)\n");
+               }
        }
-       if (!cls.signon)
+       else
        {
-               //Con_Print("reconnect: no signon, ignoring reconnect\n");
-               return;
+               if (Cmd_Argc() != 1)
+               {
+                       Con_Print("reconnect : wait for signon messages again\n");
+                       return;
+               }
+               if (!cls.signon)
+               {
+                       Con_Print("reconnect: no signon, ignoring reconnect\n");
+                       return;
+               }
+               cls.signon = 0;         // need new connection messages
        }
-       cls.signon = 0;         // need new connection messages
 }
 
 /*
@@ -712,6 +729,7 @@ void Host_Loadgame_f (void)
 
                entnum++;
        }
+       Mem_Free(text);
 
        prog->num_edicts = entnum;
        sv.time = time;
@@ -758,6 +776,7 @@ void Host_Name_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_name", newName);
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "name", newName);
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
@@ -817,6 +836,7 @@ void Host_Playermodel_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_playermodel", newPath);
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "playermodel", newPath);
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
@@ -876,6 +896,7 @@ void Host_Playerskin_f (void)
        if (cmd_source == src_command)
        {
                Cvar_Set ("_cl_playerskin", newPath);
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "playerskin", newPath);
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
@@ -1093,11 +1114,16 @@ void Host_Color_f(void)
        if (cmd_source == src_command)
        {
                Cvar_SetValue ("_cl_color", playercolor);
-               if (cls.state == ca_connected)
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "topcolor", va("%i", top));
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "bottomcolor", va("%i", bottom));
+               if (cls.state == ca_connected && cls.protocol != PROTOCOL_QUAKEWORLD)
                        Cmd_ForwardToServer ();
                return;
        }
 
+       if (cls.protocol == PROTOCOL_QUAKEWORLD)
+               return;
+
        if (host_client->edict && (f = PRVM_ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - prog->functions)))
        {
                Con_DPrint("Calling SV_ChangeTeam\n");
@@ -1144,6 +1170,7 @@ void Host_Rate_f(void)
        if (cmd_source == src_command)
        {
                Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE));
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "rate", va("%i", rate));
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;
@@ -1395,10 +1422,21 @@ void Host_Spawn_f (void)
        // in a state where it is expecting the client to correct the angle
        // and it won't happen if the game was just loaded, so you wind up
        // with a permanent head tilt
-       MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
-       MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[0], sv.protocol);
-       MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[1], sv.protocol);
-       MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+       if (sv.loadgame)
+       {
+               MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
+               MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->v_angle[0], sv.protocol);
+               MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->v_angle[1], sv.protocol);
+               MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+               sv.loadgame = false; // we're basically done with loading now
+       }
+       else
+       {
+               MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
+               MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[0], sv.protocol);
+               MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[1], sv.protocol);
+               MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+       }
 
        SV_WriteClientdataToMessage (host_client, host_client->edict, &host_client->netconnection->message, stats);
 
@@ -1948,20 +1986,6 @@ static void MaxPlayers_f(void)
 
 // QuakeWorld commands
 
-char emodel_name[] =
-       { 'e' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
-char pmodel_name[] =
-       { 'p' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
-char prespawn_name[] =
-       { 'p'^0xff, 'r'^0xff, 'e'^0xff, 's'^0xff, 'p'^0xff, 'a'^0xff, 'w'^0xff, 'n'^0xff,
-               ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '0'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-char modellist_name[] =
-       { 'm'^0xff, 'o'^0xff, 'd'^0xff, 'e'^0xff, 'l'^0xff, 'l'^0xff, 'i'^0xff, 's'^0xff, 't'^0xff,
-               ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-char soundlist_name[] =
-       { 's'^0xff, 'o'^0xff, 'u'^0xff, 'n'^0xff, 'd'^0xff, 'l'^0xff, 'i'^0xff, 's'^0xff, 't'^0xff,
-               ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-
 /*
 =====================
 Host_Rcon_f
@@ -2010,6 +2034,180 @@ void Host_Rcon_f (void) // credit: taken from QuakeWorld
        }
 }
 
+/*
+====================
+Host_User_f
+
+user <name or userid>
+
+Dump userdata / masterdata for a user
+====================
+*/
+void Host_User_f (void) // credit: taken from QuakeWorld
+{
+       int             uid;
+       int             i;
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf ("Usage: user <username / userid>\n");
+               return;
+       }
+
+       uid = atoi(Cmd_Argv(1));
+
+       for (i = 0;i < cl.maxclients;i++)
+       {
+               if (!cl.scores[i].name[0])
+                       continue;
+               if (cl.scores[i].qw_userid == uid || !strcasecmp(cl.scores[i].name, Cmd_Argv(1)))
+               {
+                       InfoString_Print(cl.scores[i].qw_userinfo);
+                       return;
+               }
+       }
+       Con_Printf ("User not in server.\n");
+}
+
+/*
+====================
+Host_Users_f
+
+Dump userids for all current players
+====================
+*/
+void Host_Users_f (void) // credit: taken from QuakeWorld
+{
+       int             i;
+       int             c;
+
+       c = 0;
+       Con_Printf ("userid frags name\n");
+       Con_Printf ("------ ----- ----\n");
+       for (i = 0;i < cl.maxclients;i++)
+       {
+               if (cl.scores[i].name[0])
+               {
+                       Con_Printf ("%6i %4i %s\n", cl.scores[i].qw_userid, cl.scores[i].frags, cl.scores[i].name);
+                       c++;
+               }
+       }
+
+       Con_Printf ("%i total users\n", c);
+}
+
+/*
+==================
+Host_FullServerinfo_f
+
+Sent by server when serverinfo changes
+==================
+*/
+// TODO: shouldn't this be a cvar instead?
+void Host_FullServerinfo_f (void) // credit: taken from QuakeWorld
+{
+       char temp[512];
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf ("usage: fullserverinfo <complete info string>\n");
+               return;
+       }
+
+       strlcpy (cl.qw_serverinfo, Cmd_Argv(1), sizeof(cl.qw_serverinfo));
+       InfoString_GetValue(cl.qw_serverinfo, "teamplay", temp, sizeof(temp));
+       cl.qw_teamplay = atoi(temp);
+}
+
+/*
+==================
+Host_FullInfo_f
+
+Allow clients to change userinfo
+==================
+Casey was here :)
+*/
+void Host_FullInfo_f (void) // credit: taken from QuakeWorld
+{
+       char key[512];
+       char value[512];
+       char *o;
+       const char *s;
+
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf ("fullinfo <complete info string>\n");
+               return;
+       }
+
+       s = Cmd_Argv(1);
+       if (*s == '\\')
+               s++;
+       while (*s)
+       {
+               o = key;
+               while (*s && *s != '\\')
+                       *o++ = *s++;
+               *o = 0;
+
+               if (!*s)
+               {
+                       Con_Printf ("MISSING VALUE\n");
+                       return;
+               }
+
+               o = value;
+               s++;
+               while (*s && *s != '\\')
+                       *o++ = *s++;
+               *o = 0;
+
+               if (*s)
+                       s++;
+
+               if (!strcasecmp(key, "pmodel") || !strcasecmp(key, "emodel"))
+                       continue;
+
+               if (key[0] == '*')
+               {
+                       Con_Printf("Can't set star-key \"%s\" to \"%s\"\n", key, value);
+                       continue;
+               }
+
+               InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), key, value);
+       }
+}
+
+/*
+==================
+CL_SetInfo_f
+
+Allow clients to change userinfo
+==================
+*/
+void Host_SetInfo_f (void) // credit: taken from QuakeWorld
+{
+       if (Cmd_Argc() == 1)
+       {
+               InfoString_Print(cls.userinfo);
+               return;
+       }
+       if (Cmd_Argc() != 3)
+       {
+               Con_Printf ("usage: setinfo [ <key> <value> ]\n");
+               return;
+       }
+       if (!strcasecmp(Cmd_Argv(1), "pmodel") || !strcasecmp(Cmd_Argv(1), "emodel"))
+               return;
+       if (Cmd_Argv(1)[0] == '*')
+       {
+               Con_Printf("Can't set star-key \"%s\" to \"%s\"\n", Cmd_Argv(1), Cmd_Argv(2));
+               return;
+       }
+       InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), Cmd_Argv(1), Cmd_Argv(2));
+       if (cls.state == ca_connected)
+               Cmd_ForwardToServer ();
+}
+
 /*
 ====================
 Host_Packet_f
@@ -2044,7 +2242,7 @@ void Host_Packet_f (void) // credit: taken from QuakeWorld
        out = send+4;
        send[0] = send[1] = send[2] = send[3] = 0xff;
 
-       l = strlen (in);
+       l = (int)strlen (in);
        for (i=0 ; i<l ; i++)
        {
                if (out >= send + sizeof(send) - 1)
@@ -2054,14 +2252,33 @@ void Host_Packet_f (void) // credit: taken from QuakeWorld
                        *out++ = '\n';
                        i++;
                }
+               else if (in[i] == '\\' && in[i+1] == '0')
+               {
+                       *out++ = '\0';
+                       i++;
+               }
+               else if (in[i] == '\\' && in[i+1] == 't')
+               {
+                       *out++ = '\t';
+                       i++;
+               }
+               else if (in[i] == '\\' && in[i+1] == 'r')
+               {
+                       *out++ = '\r';
+                       i++;
+               }
+               else if (in[i] == '\\' && in[i+1] == '"')
+               {
+                       *out++ = '\"';
+                       i++;
+               }
                else
                        *out++ = in[i];
        }
-       *out = 0;
 
        mysocket = NetConn_ChooseClientSocketForAddress(&address);
        if (mysocket)
-               NetConn_WriteString(mysocket, send, &address);
+               NetConn_Write(mysocket, send, out - send, &address);
 }
 
 //=============================================================================
@@ -2073,6 +2290,8 @@ Host_InitCommands
 */
 void Host_InitCommands (void)
 {
+       strcpy(cls.userinfo, "\\name\\player\\team\\none\\topcolor\\0\\bottomcolor\\0\\rate\\10000\\msg\\1\\*ver\\dp");
+
        Cmd_AddCommand ("status", Host_Status_f, "print server status information");
        Cmd_AddCommand ("quit", Host_Quit_f, "quit the game");
        if (gamemode == GAME_NEHAHRA)
@@ -2144,6 +2363,11 @@ void Host_InitCommands (void)
        Cvar_RegisterVariable (&rcon_password);
        Cvar_RegisterVariable (&rcon_address);
        Cmd_AddCommand ("rcon", Host_Rcon_f, "sends a command to the server console (if your rcon_password matches the server's rcon_password), or to the address specified by rcon_address when not connected (again rcon_password must match the server's)");
+       Cmd_AddCommand ("user", Host_User_f, "prints additional information about a player number or name on the scoreboard");
+       Cmd_AddCommand ("users", Host_Users_f, "prints additional information about all players on the scoreboard");
+       Cmd_AddCommand ("fullserverinfo", Host_FullServerinfo_f, "internal use only, sent by server to client to update client's local copy of serverinfo string");
+       Cmd_AddCommand ("fullinfo", Host_FullInfo_f, "allows client to modify their userinfo");
+       Cmd_AddCommand ("setinfo", Host_SetInfo_f, "modifies your userinfo");
        Cmd_AddCommand ("packet", Host_Packet_f, "send a packet to the specified address:port containing a text string");
 
        Cvar_RegisterVariable(&sv_cheats);