X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=f23c658de52405b471309ecf77d2175e4238cba3;hb=f49029f53c54840c95c108047328428c9204f62c;hp=cfa9bb3fcf9eb49e9f53677d4f6eb49d1a78afd6;hpb=9878868f40ebebd6aeaa254d0b1fb4759211a394;p=xonotic%2Fdarkplaces.git diff --git a/host_cmd.c b/host_cmd.c index cfa9bb3f..f23c658d 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -19,11 +19,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "quakedef.h" +#include "libcurl.h" int current_skill; cvar_t sv_cheats = {0, "sv_cheats", "0", "enables cheat commands in any game, and cheat impulses in dpmod"}; -cvar_t rcon_password = {0, "rcon_password", "", "password to authenticate rcon commands"}; +cvar_t rcon_password = {CVAR_PRIVATE, "rcon_password", "", "password to authenticate rcon commands"}; cvar_t rcon_address = {0, "rcon_address", "", "server address to send rcon commands to (when not connected to a server)"}; +cvar_t team = {CVAR_USERINFO | CVAR_SAVE, "team", "none", "QW team (4 character limit, example: blue)"}; +cvar_t skin = {CVAR_USERINFO | CVAR_SAVE, "skin", "", "QW player skin name (example: base)"}; +cvar_t noaim = {CVAR_USERINFO | CVAR_SAVE, "noaim", "1", "QW option to disable vertical autoaim"}; qboolean allowcheats = false; /* @@ -51,7 +55,8 @@ void Host_Status_f (void) if (cmd_source == src_command) { - if (!sv.active) + // 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 (); return; @@ -61,6 +66,9 @@ void Host_Status_f (void) else print = SV_ClientPrintf; + if (!sv.active) + return; + for (players = 0, j = 0;j < svs.maxclients;j++) if (svs.clients[j].active) players++; @@ -84,7 +92,7 @@ void Host_Status_f (void) } else hours = 0; - print ("#%-2u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->fields.server->frags, hours, minutes, seconds); + print ("#%-3u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->fields.server->frags, hours, minutes, seconds); print (" %s\n", client->netconnection ? client->netconnection->address : "botclient"); } } @@ -209,6 +217,7 @@ Host_Ping_f ================== */ +void Host_Pings_f (void); // called by Host_Ping_f void Host_Ping_f (void) { int i; @@ -217,7 +226,8 @@ void Host_Ping_f (void) if (cmd_source == src_command) { - if (!sv.active) + // 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 (); return; @@ -227,6 +237,9 @@ void Host_Ping_f (void) else print = SV_ClientPrintf; + if (!sv.active) + return; + print("Client ping times:\n"); for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) { @@ -234,6 +247,9 @@ void Host_Ping_f (void) continue; print("%4i %s\n", (int)floor(client->ping*1000+0.5), client->name); } + + // now call the Pings command also, which will send a report that contains packet loss for the scoreboard (as well as a simpler ping report) + Host_Pings_f(); } /* @@ -271,9 +287,8 @@ void Host_Map_f (void) CL_Disconnect (); Host_ShutdownServer(); - // remove console or menu + // remove menu key_dest = key_game; - key_consoleactive = 0; svs.serverflags = 0; // haven't completed an episode yet allowcheats = sv_cheats.integer != 0; @@ -281,6 +296,29 @@ 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 } /* @@ -299,11 +337,6 @@ void Host_Changelevel_f (void) Con_Print("changelevel : continue game on a new level\n"); return; } - if (cls.demoplayback) - { - Con_Print("Only the server may changelevel\n"); - return; - } // HACKHACKHACK if (!sv.active) { Host_Map_f(); @@ -312,9 +345,8 @@ void Host_Changelevel_f (void) if (cmd_source != src_command) return; - // remove console or menu + // remove menu key_dest = key_game; - key_consoleactive = 0; SV_VM_Begin(); SV_SaveSpawnparms (); @@ -350,9 +382,8 @@ void Host_Restart_f (void) if (cmd_source != src_command) return; - // remove console or menu + // remove menu key_dest = key_game; - key_consoleactive = 0; allowcheats = sv_cheats.integer != 0; strcpy(mapname, sv.name); @@ -387,7 +418,16 @@ void Host_Reconnect_f (void) MSG_WriteString(&cls.netcon->message, "new"); } else - Con_Printf("Please use connect instead (reconnect not implemented)\n"); + { + char temp[128]; + // if we have connected to a server recently, the userinfo + // will still contain its IP address, so get the address... + InfoString_GetValue(cls.userinfo, "*ip", temp, sizeof(temp)); + if (temp[0]) + CL_EstablishConnection(temp); + else + Con_Printf("Reconnect to what server? (you have not connected to a server yet)\n"); + } } } else @@ -603,7 +643,7 @@ void Host_Loadgame_f (void) } // version - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); version = atoi(com_token); if (version != SAVEGAME_VERSION) { @@ -619,21 +659,21 @@ void Host_Loadgame_f (void) for (i = 0;i < NUM_SPAWN_PARMS;i++) { - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); spawn_parms[i] = atof(com_token); } // skill - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); // this silliness is so we can load 1.06 save files, which have float skill values current_skill = (int)(atof(com_token) + 0.5); Cvar_SetValue ("skill", (float)current_skill); // mapname - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); strcpy (mapname, com_token); // time - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); time = atof(com_token); allowcheats = sv_cheats.integer != 0; @@ -654,7 +694,7 @@ void Host_Loadgame_f (void) { // light style oldt = t; - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); // if this is a 64 lightstyle savegame produced by Quake, stop now // we have to check this because darkplaces saves 256 lightstyle savegames if (com_token[0] == '{') @@ -672,7 +712,7 @@ void Host_Loadgame_f (void) for(;;) { oldt = t; - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); if (com_token[0] == '{') { t = oldt; @@ -687,10 +727,10 @@ void Host_Loadgame_f (void) for (;;) { start = t; - while (COM_ParseToken(&t, false)) + while (COM_ParseTokenConsole(&t)) if (!strcmp(com_token, "}")) break; - if (!COM_ParseToken(&start, false)) + if (!COM_ParseTokenConsole(&start)) { // end of file break; @@ -729,6 +769,7 @@ void Host_Loadgame_f (void) entnum++; } + Mem_Free(text); prog->num_edicts = entnum; sv.time = time; @@ -775,9 +816,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 (); + CL_SetInfo("name", newName, true, false, false, false); return; } @@ -835,9 +874,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 (); + CL_SetInfo("playermodel", newPath, true, false, false, false); return; } @@ -895,9 +932,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 (); + CL_SetInfo("playerskin", newPath, true, false, false, false); return; } @@ -917,8 +952,8 @@ void Host_Playerskin_f (void) PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PRVM_SetEngineString(host_client->playerskin); if (strcmp(host_client->old_skin, host_client->playerskin)) { - if (host_client->spawned) - SV_BroadcastPrintf("%s changed skin to %s\n", host_client->name, host_client->playerskin); + //if (host_client->spawned) + // SV_BroadcastPrintf("%s changed skin to %s\n", host_client->name, host_client->playerskin); strcpy(host_client->old_skin, host_client->playerskin); /*// send notification to all clients MSG_WriteByte (&sv.reliable_datagram, svc_updatepskin); @@ -962,7 +997,6 @@ void Host_Say(qboolean teamonly) if (!teamplay.integer) teamonly = false; -// turn on color set 1 p1 = Cmd_Args(); quoted = false; if (*p1 == '\"') @@ -970,10 +1004,11 @@ void Host_Say(qboolean teamonly) quoted = true; p1++; } + // note this uses the chat prefix \001 if (!fromServer) - dpsnprintf (text, sizeof(text), "%c%s" STRING_COLOR_DEFAULT_STR ": %s", 1, host_client->name, p1); + dpsnprintf (text, sizeof(text), "\001%s" STRING_COLOR_DEFAULT_STR ": %s", host_client->name, p1); else - dpsnprintf (text, sizeof(text), "%c<%s" STRING_COLOR_DEFAULT_STR "> %s", 1, hostname.string, p1); + dpsnprintf (text, sizeof(text), "\001<%s" STRING_COLOR_DEFAULT_STR "> %s", hostname.string, p1); p2 = text + strlen(text); while ((const char *)p2 > (const char *)text && (p2[-1] == '\r' || p2[-1] == '\n' || (p2[-1] == '\"' && quoted))) { @@ -1030,10 +1065,11 @@ void Host_Tell_f(void) if (Cmd_Argc () < 3) return; + // note this uses the chat prefix \001 if (!fromServer) - sprintf (text, "%s: ", host_client->name); + sprintf (text, "\001%s tells you: ", host_client->name); else - sprintf (text, "<%s> ", hostname.string); + sprintf (text, "\001<%s tells you> ", hostname.string); p1 = Cmd_Args(); p2 = p1 + strlen(p1); @@ -1077,46 +1113,39 @@ Host_Color_f ================== */ cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0", "internal storage cvar for current player colors (changed by color command)"}; -void Host_Color_f(void) +void Host_Color(int changetop, int changebottom) { - int top, bottom; - int playercolor; + int top, bottom, playercolor; mfunction_t *f; - func_t SV_ChangeTeam; + func_t SV_ChangeTeam; - if (Cmd_Argc() == 1) - { - Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15); - Con_Print("color <0-15> [0-15]\n"); - return; - } - - if (Cmd_Argc() == 2) - top = bottom = atoi(Cmd_Argv(1)); - else - { - top = atoi(Cmd_Argv(1)); - bottom = atoi(Cmd_Argv(2)); - } + // get top and bottom either from the provided values or the current values + // (allows changing only top or bottom, or both at once) + top = changetop >= 0 ? changetop : (cl_color.integer >> 4); + bottom = changebottom >= 0 ? changebottom : cl_color.integer; top &= 15; - // LordHavoc: allow skin colormaps 14 and 15 (was 13) - if (top > 15) - top = 15; bottom &= 15; - // LordHavoc: allow skin colormaps 14 and 15 (was 13) - if (bottom > 15) - bottom = 15; + // LordHavoc: allowing skin colormaps 14 and 15 by commenting this out + //if (top > 13) + // top = 13; + //if (bottom > 13) + // bottom = 13; playercolor = top*16 + bottom; if (cmd_source == src_command) { - Cvar_SetValue ("_cl_color", playercolor); - 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 (); + 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; } @@ -1152,6 +1181,51 @@ void Host_Color_f(void) } } +void Host_Color_f(void) +{ + int top, bottom; + + if (Cmd_Argc() == 1) + { + Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15); + Con_Print("color <0-15> [0-15]\n"); + return; + } + + if (Cmd_Argc() == 2) + top = bottom = atoi(Cmd_Argv(1)); + else + { + top = atoi(Cmd_Argv(1)); + bottom = atoi(Cmd_Argv(2)); + } + Host_Color(top, bottom); +} + +void Host_TopColor_f(void) +{ + if (Cmd_Argc() == 1) + { + Con_Printf("\"topcolor\" is \"%i\"\n", (cl_color.integer >> 4) & 15); + Con_Print("topcolor <0-15>\n"); + return; + } + + Host_Color(atoi(Cmd_Argv(1)), -1); +} + +void Host_BottomColor_f(void) +{ + if (Cmd_Argc() == 1) + { + Con_Printf("\"bottomcolor\" is \"%i\"\n", cl_color.integer & 15); + Con_Print("bottomcolor <0-15>\n"); + return; + } + + Host_Color(-1, atoi(Cmd_Argv(1))); +} + cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000", "internal storage cvar for current rate (changed by rate command)"}; void Host_Rate_f(void) { @@ -1169,9 +1243,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 (); + CL_SetInfo("rate", va("%i", rate), true, false, false, false); return; } @@ -1402,29 +1474,40 @@ void Host_Spawn_f (void) // send some stats MSG_WriteByte (&host_client->netconnection->message, svc_updatestat); MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALSECRETS); - MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->total_secrets); + MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_secrets); MSG_WriteByte (&host_client->netconnection->message, svc_updatestat); MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALMONSTERS); - MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->total_monsters); + MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_monsters); MSG_WriteByte (&host_client->netconnection->message, svc_updatestat); MSG_WriteByte (&host_client->netconnection->message, STAT_SECRETS); - MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->found_secrets); + MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->found_secrets); MSG_WriteByte (&host_client->netconnection->message, svc_updatestat); MSG_WriteByte (&host_client->netconnection->message, STAT_MONSTERS); - MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->killed_monsters); + MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->killed_monsters); // send a fixangle // Never send a roll angle, because savegames can catch the server // 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); @@ -1445,6 +1528,8 @@ void Host_Begin_f (void) return; } + Curl_SendRequirements(); + host_client->spawned = true; } @@ -1474,7 +1559,7 @@ void Host_Kick_f (void) if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0) { - i = atof(Cmd_Argv(2)) - 1; + i = (int)(atof(Cmd_Argv(2)) - 1); if (i < 0 || i >= svs.maxclients || !(host_client = svs.clients + i)->active) return; byNumber = true; @@ -1509,7 +1594,7 @@ void Host_Kick_f (void) if (Cmd_Argc() > 2) { message = Cmd_Args(); - COM_ParseToken(&message, false); + COM_ParseTokenConsole(&message); if (byNumber) { message++; // skip the # @@ -1802,7 +1887,7 @@ void Host_Viewnext_f (void) if (e->fields.server->frame >= m->numframes) e->fields.server->frame = m->numframes - 1; - PrintFrameName (m, e->fields.server->frame); + PrintFrameName (m, (int)e->fields.server->frame); } /* @@ -1830,7 +1915,7 @@ void Host_Viewprev_f (void) if (e->fields.server->frame < 0) e->fields.server->frame = 0; - PrintFrameName (m, e->fields.server->frame); + PrintFrameName (m, (int)e->fields.server->frame); } /* @@ -1919,7 +2004,7 @@ void Host_SendCvar_f (void) if(Cmd_Argc() != 2) return; - if(!(c = Cvar_FindVar(Cmd_Argv(1)))) + if(!(c = Cvar_FindVar(Cmd_Argv(1))) || (c->flags & CVAR_PRIVATE)) return; if (cls.state != ca_dedicated) Cmd_ForwardStringToServer(va("sentcvar %s %s\n", c->name, c->string)); @@ -2007,7 +2092,7 @@ void Host_Rcon_f (void) // credit: taken from QuakeWorld to = cls.netcon->peeraddress; else { - if (!rcon_address.integer || !rcon_address.string[0]) + if (!rcon_address.string[0]) { Con_Printf ("You must either be connected, or set the rcon_address cvar to issue rcon commands\n"); return; @@ -2152,16 +2237,7 @@ void Host_FullInfo_f (void) // credit: taken from QuakeWorld 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(key, value, false, false, false, false); } } @@ -2184,16 +2260,7 @@ void Host_SetInfo_f (void) // credit: taken from QuakeWorld Con_Printf ("usage: setinfo [ ]\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 (); + CL_SetInfo(Cmd_Argv(1), Cmd_Argv(2), true, false, false, false); } /* @@ -2269,6 +2336,71 @@ void Host_Packet_f (void) // credit: taken from QuakeWorld NetConn_Write(mysocket, send, out - send, &address); } +/* +==================== +Host_Pings_f + +Send back ping and packet loss update for all current players to this player +==================== +*/ +void Host_Pings_f (void) +{ + int i, j, ping, packetloss; + char temp[128]; + + if (cmd_source == src_command) + { + Cmd_ForwardToServer (); + return; + } + if (!host_client->netconnection) + return; + + if (sv.protocol != PROTOCOL_QUAKEWORLD) + { + MSG_WriteByte(&host_client->netconnection->message, svc_stufftext); + MSG_WriteUnterminatedString(&host_client->netconnection->message, "pingplreport"); + } + for (i = 0;i < svs.maxclients;i++) + { + packetloss = 0; + if (svs.clients[i].netconnection) + for (j = 0;j < 100;j++) + packetloss += svs.clients[i].netconnection->packetlost[j]; + ping = (int)floor(svs.clients[i].ping*1000+0.5); + ping = bound(0, ping, 9999); + if (sv.protocol == PROTOCOL_QUAKEWORLD) + { + // send qw_svc_updateping and qw_svc_updatepl messages + MSG_WriteByte(&host_client->netconnection->message, qw_svc_updateping); + MSG_WriteShort(&host_client->netconnection->message, ping); + MSG_WriteByte(&host_client->netconnection->message, qw_svc_updatepl); + MSG_WriteByte(&host_client->netconnection->message, packetloss); + } + else + { + // write the string into the packet as multiple unterminated strings to avoid needing a local buffer + dpsnprintf(temp, sizeof(temp), " %d %d", ping, packetloss); + MSG_WriteUnterminatedString(&host_client->netconnection->message, temp); + } + } + if (sv.protocol != PROTOCOL_QUAKEWORLD) + MSG_WriteString(&host_client->netconnection->message, "\n"); +} + +void Host_PingPLReport_f(void) +{ + int i; + int l = Cmd_Argc(); + if (l > cl.maxclients) + l = cl.maxclients; + for (i = 0;i < l;i++) + { + cl.scores[i].qw_ping = atoi(Cmd_Argv(1+i*2)); + cl.scores[i].qw_packetloss = atoi(Cmd_Argv(1+i*2+1)); + } +} + //============================================================================= /* @@ -2278,7 +2410,7 @@ Host_InitCommands */ void Host_InitCommands (void) { - strcpy(cls.userinfo, "\\name\\player\\team\\none\\topcolor\\0\\bottomcolor\\0\\rate\\10000\\msg\\1\\*ver\\dp"); + dpsnprintf(cls.userinfo, sizeof(cls.userinfo), "\\name\\player\\team\\none\\topcolor\\0\\bottomcolor\\0\\rate\\10000\\msg\\1\\noaim\\1\\*ver\\%s", engineversion); Cmd_AddCommand ("status", Host_Status_f, "print server status information"); Cmd_AddCommand ("quit", Host_Quit_f, "quit the game"); @@ -2357,6 +2489,15 @@ void Host_InitCommands (void) 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"); + Cmd_AddCommand ("topcolor", Host_TopColor_f, "QW command to set top color without changing bottom color"); + Cmd_AddCommand ("bottomcolor", Host_BottomColor_f, "QW command to set bottom color without changing top color"); + + Cmd_AddCommand ("pings", Host_Pings_f, "command sent by clients to request updated ping and packetloss of players on scoreboard (originally from QW, but also used on NQ servers)"); + Cmd_AddCommand ("pingplreport", Host_PingPLReport_f, "command sent by server containing client ping and packet loss values for scoreboard, triggered by pings command from client (not used by QW servers)"); + + Cvar_RegisterVariable (&team); + Cvar_RegisterVariable (&skin); + Cvar_RegisterVariable (&noaim); Cvar_RegisterVariable(&sv_cheats); }