X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host_cmd.c;h=4dcc0e5d8a7363d0e80f09c7aa5a03d320b5ba3c;hp=5f1569aa639e9e24874dfe1dbceb14dddd722664;hb=a7cc13d2f12eedcaa354066f531fb1529e204784;hpb=c23fe31b01226dd380a1273216ff42eb3f875e45 diff --git a/host_cmd.c b/host_cmd.c index 5f1569aa..4dcc0e5d 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -19,10 +19,10 @@ 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 sv_adminnick = {CVAR_SAVE, "sv_adminnick", "", "nick name to use for admin messages instead of host name"}; 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)"}; @@ -55,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; @@ -65,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++; @@ -88,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, client->frags, hours, minutes, seconds); print (" %s\n", client->netconnection ? client->netconnection->address : "botclient"); } } @@ -103,12 +107,6 @@ Sets client to godmode */ void Host_God_f (void) { - if (cmd_source == src_command) - { - Cmd_ForwardToServer (); - return; - } - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); @@ -124,12 +122,6 @@ void Host_God_f (void) void Host_Notarget_f (void) { - if (cmd_source == src_command) - { - Cmd_ForwardToServer (); - return; - } - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); @@ -147,12 +139,6 @@ qboolean noclip_anglehack; void Host_Noclip_f (void) { - if (cmd_source == src_command) - { - Cmd_ForwardToServer (); - return; - } - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); @@ -182,12 +168,6 @@ Sets client to flymode */ void Host_Fly_f (void) { - if (cmd_source == src_command) - { - Cmd_ForwardToServer (); - return; - } - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); @@ -213,6 +193,7 @@ Host_Ping_f ================== */ +void Host_Pings_f (void); // called by Host_Ping_f void Host_Ping_f (void) { int i; @@ -221,7 +202,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; @@ -231,13 +213,19 @@ 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++) { if (!client->active) continue; - print("%4i %s\n", (int)floor(client->ping*1000+0.5), client->name); + print("%4i %s\n", bound(0, (int)floor(client->ping*1000+0.5), 9999), 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(); } /* @@ -267,9 +255,6 @@ void Host_Map_f (void) return; } - if (cmd_source != src_command) - return; - cls.demonum = -1; // stop demo loop in case this fails CL_Disconnect (); @@ -280,33 +265,10 @@ void Host_Map_f (void) svs.serverflags = 0; // haven't completed an episode yet allowcheats = sv_cheats.integer != 0; - strcpy(level, Cmd_Argv(1)); + strlcpy(level, Cmd_Argv(1), sizeof(level)); 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 } /* @@ -330,8 +292,6 @@ void Host_Changelevel_f (void) Host_Map_f(); return; } - if (cmd_source != src_command) - return; // remove menu key_dest = key_game; @@ -340,7 +300,7 @@ void Host_Changelevel_f (void) SV_SaveSpawnparms (); SV_VM_End(); allowcheats = sv_cheats.integer != 0; - strcpy(level, Cmd_Argv(1)); + strlcpy(level, Cmd_Argv(1), sizeof(level)); SV_SpawnServer(level); if (sv.active && cls.state == ca_disconnected) CL_EstablishConnection("local:1"); @@ -367,14 +327,12 @@ void Host_Restart_f (void) Con_Print("Only the server may restart\n"); return; } - if (cmd_source != src_command) - return; // remove menu key_dest = key_game; allowcheats = sv_cheats.integer != 0; - strcpy(mapname, sv.name); + strlcpy(mapname, sv.name, sizeof(mapname)); SV_SpawnServer(mapname); if (sv.active && cls.state == ca_disconnected) CL_EstablishConnection("local:1"); @@ -390,36 +348,38 @@ This is sent just before a server changes levels */ void Host_Reconnect_f (void) { + char temp[128]; + // if not connected, reconnect to the most recent server + if (!cls.netcon) + { + // 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"); + return; + } + // if connected, do something based on protocol if (cls.protocol == PROTOCOL_QUAKEWORLD) { + // quakeworld can just re-login if (cls.qw_downloadmemory) // don't change when downloading return; S_StopAllSounds(); - if (cls.netcon) + if (cls.state == ca_connected && cls.signon < SIGNONS) { - 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 - { - 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"); - } + Con_Printf("reconnecting...\n"); + MSG_WriteChar(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, "new"); } } else { + // netquake uses reconnect on level changes (silly) if (Cmd_Argc() != 1) { Con_Print("reconnect : wait for signon messages again\n"); @@ -501,9 +461,6 @@ void Host_Savegame_f (void) int i; char comment[SAVEGAME_COMMENT_LENGTH+1]; - if (cmd_source != src_command) - return; - if (cls.state != ca_connected || !sv.active) { Con_Print("Not playing a local game.\n"); @@ -607,16 +564,13 @@ void Host_Loadgame_f (void) int version; float spawn_parms[NUM_SPAWN_PARMS]; - if (cmd_source != src_command) - return; - if (Cmd_Argc() != 2) { Con_Print("load : load a game\n"); return; } - strcpy (filename, Cmd_Argv(1)); + strlcpy (filename, Cmd_Argv(1), sizeof(filename)); FS_DefaultExtension (filename, ".sav", sizeof (filename)); Con_Printf("Loading game from %s...\n", filename); @@ -631,7 +585,7 @@ void Host_Loadgame_f (void) } // version - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); version = atoi(com_token); if (version != SAVEGAME_VERSION) { @@ -647,21 +601,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); - strcpy (mapname, com_token); + COM_ParseTokenConsole(&t); + strlcpy (mapname, com_token, sizeof(mapname)); // time - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); time = atof(com_token); allowcheats = sv_cheats.integer != 0; @@ -682,7 +636,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] == '{') @@ -700,7 +654,7 @@ void Host_Loadgame_f (void) for(;;) { oldt = t; - COM_ParseToken(&t, false); + COM_ParseTokenConsole(&t); if (com_token[0] == '{') { t = oldt; @@ -715,10 +669,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; @@ -779,7 +733,7 @@ void Host_Loadgame_f (void) Host_Name_f ====================== */ -cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player", "internal storage cvar for current player name (changed by name command)"}; +cvar_t cl_name = {CVAR_SAVE | CVAR_NQUSERINFOHACK, "_cl_name", "player", "internal storage cvar for current player name (changed by name command)"}; void Host_Name_f (void) { int i, j; @@ -804,7 +758,6 @@ void Host_Name_f (void) if (cmd_source == src_command) { Cvar_Set ("_cl_name", newName); - CL_SetInfo("name", newName, true, false, false, false); return; } @@ -823,7 +776,7 @@ void Host_Name_f (void) { if (host_client->spawned) SV_BroadcastPrintf("%s changed name to %s\n", host_client->old_name, host_client->name); - strcpy(host_client->old_name, host_client->name); + strlcpy(host_client->old_name, host_client->name, sizeof(host_client->old_name)); // send notification to all clients MSG_WriteByte (&sv.reliable_datagram, svc_updatename); MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients); @@ -836,7 +789,7 @@ void Host_Name_f (void) Host_Playermodel_f ====================== */ -cvar_t cl_playermodel = {CVAR_SAVE, "_cl_playermodel", "", "internal storage cvar for current player model in Nexuiz (changed by playermodel command)"}; +cvar_t cl_playermodel = {CVAR_SAVE | CVAR_NQUSERINFOHACK, "_cl_playermodel", "", "internal storage cvar for current player model in Nexuiz (changed by playermodel command)"}; // the old cl_playermodel in cl_main has been renamed to __cl_playermodel void Host_Playermodel_f (void) { @@ -862,7 +815,6 @@ void Host_Playermodel_f (void) if (cmd_source == src_command) { Cvar_Set ("_cl_playermodel", newPath); - CL_SetInfo("playermodel", newPath, true, false, false, false); return; } @@ -878,11 +830,11 @@ void Host_Playermodel_f (void) // point the string back at updateclient->name to keep it safe strlcpy (host_client->playermodel, newPath, sizeof (host_client->playermodel)); - if( eval_playermodel ) - PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PRVM_SetEngineString(host_client->playermodel); + if( prog->fieldoffsets.playermodel >= 0 ) + PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.playermodel)->string = PRVM_SetEngineString(host_client->playermodel); if (strcmp(host_client->old_model, host_client->playermodel)) { - strcpy(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); @@ -895,7 +847,7 @@ void Host_Playermodel_f (void) Host_Playerskin_f ====================== */ -cvar_t cl_playerskin = {CVAR_SAVE, "_cl_playerskin", "", "internal storage cvar for current player skin in Nexuiz (changed by playerskin command)"}; +cvar_t cl_playerskin = {CVAR_SAVE | CVAR_NQUSERINFOHACK, "_cl_playerskin", "", "internal storage cvar for current player skin in Nexuiz (changed by playerskin command)"}; void Host_Playerskin_f (void) { int i, j; @@ -920,7 +872,6 @@ void Host_Playerskin_f (void) if (cmd_source == src_command) { Cvar_Set ("_cl_playerskin", newPath); - CL_SetInfo("playerskin", newPath, true, false, false, false); return; } @@ -936,13 +887,13 @@ void Host_Playerskin_f (void) // point the string back at updateclient->name to keep it safe strlcpy (host_client->playerskin, newPath, sizeof (host_client->playerskin)); - if( eval_playerskin ) - PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PRVM_SetEngineString(host_client->playerskin); + if( prog->fieldoffsets.playerskin >= 0 ) + PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.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); - strcpy(host_client->old_skin, 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); @@ -995,6 +946,8 @@ void Host_Say(qboolean teamonly) // note this uses the chat prefix \001 if (!fromServer) 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 dpsnprintf (text, sizeof(text), "\001<%s" STRING_COLOR_DEFAULT_STR "> %s", hostname.string, p1); p2 = text + strlen(text); @@ -1010,7 +963,7 @@ void Host_Say(qboolean teamonly) // note: save is not a valid edict if fromServer is true save = host_client; for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++) - if (host_client->spawned && (!teamonly || host_client->edict->fields.server->team == save->edict->fields.server->team)) + if (host_client->active && (!teamonly || host_client->edict->fields.server->team == save->edict->fields.server->team)) SV_ClientPrint(text); host_client = save; @@ -1033,6 +986,9 @@ void Host_Say_Team_f(void) void Host_Tell_f(void) { + const char *playername_start = NULL; + size_t playername_length = 0; + int playernumber = 0; client_t *save; int j; const char *p1, *p2; @@ -1050,22 +1006,83 @@ void Host_Tell_f(void) } } - if (Cmd_Argc () < 3) + if (Cmd_Argc () < 2) return; // note this uses the chat prefix \001 if (!fromServer) sprintf (text, "\001%s tells you: ", host_client->name); + else if(*(sv_adminnick.string)) + sprintf (text, "\001<%s tells you> ", sv_adminnick.string); else sprintf (text, "\001<%s tells you> ", hostname.string); p1 = Cmd_Args(); p2 = p1 + strlen(p1); // remove the target name - while (p1 < p2 && *p1 != ' ') + while (p1 < p2 && *p1 == ' ') p1++; + if(*p1 == '#') + { + ++p1; + while (p1 < p2 && *p1 == ' ') + p1++; + while (p1 < p2 && isdigit(*p1)) + { + playernumber = playernumber * 10 + (*p1 - '0'); + p1++; + } + --playernumber; + } + else if(*p1 == '"') + { + ++p1; + playername_start = p1; + while (p1 < p2 && *p1 != '"') + p1++; + playername_length = p1 - playername_start; + if(p1 < p2) + p1++; + } + else + { + playername_start = p1; + while (p1 < p2 && *p1 != ' ') + p1++; + playername_length = p1 - playername_start; + } while (p1 < p2 && *p1 == ' ') p1++; + if(playername_start) + { + // set playernumber to the right client + char namebuf[128]; + if(playername_length >= sizeof(namebuf)) + { + if (fromServer) + Con_Print("Host_Tell: too long player name/ID\n"); + else + SV_ClientPrint("Host_Tell: too long player name/ID\n"); + return; + } + memcpy(namebuf, playername_start, playername_length); + namebuf[playername_length] = 0; + for (playernumber = 0; playernumber < svs.maxclients; playernumber++) + { + if (!svs.clients[playernumber].active) + continue; + if (strcasecmp(svs.clients[playernumber].name, namebuf) == 0) + break; + } + } + if(playernumber < 0 || playernumber >= svs.maxclients || !(svs.clients[playernumber].active)) + { + if (fromServer) + Con_Print("Host_Tell: invalid player name/ID\n"); + else + SV_ClientPrint("Host_Tell: invalid player name/ID\n"); + return; + } // remove trailing newlines while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) p2--; @@ -1082,15 +1099,16 @@ void Host_Tell_f(void) } while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) p2--; + if(p1 == p2) + return; // empty say for (j = (int)strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;) text[j++] = *p1++; text[j++] = '\n'; text[j++] = 0; save = host_client; - for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++) - if (host_client->spawned && !strcasecmp(host_client->name, Cmd_Argv(1))) - SV_ClientPrint(text); + host_client = svs.clients + playernumber; + SV_ClientPrint(text); host_client = save; } @@ -1100,12 +1118,10 @@ void Host_Tell_f(void) Host_Color_f ================== */ -cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0", "internal storage cvar for current player colors (changed by color command)"}; +cvar_t cl_color = {CVAR_SAVE | CVAR_NQUSERINFOHACK, "_cl_color", "0", "internal storage cvar for current player colors (changed by color command)"}; void Host_Color(int changetop, int changebottom) { int top, bottom, playercolor; - mfunction_t *f; - func_t SV_ChangeTeam; // get top and bottom either from the provided values or the current values // (allows changing only top or bottom, or both at once) @@ -1125,35 +1141,26 @@ 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; } if (cls.protocol == PROTOCOL_QUAKEWORLD) return; - if (host_client->edict && (f = PRVM_ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - prog->functions))) + if (host_client->edict && prog->funcoffsets.SV_ChangeTeam) { Con_DPrint("Calling SV_ChangeTeam\n"); prog->globals.server->time = sv.time; prog->globals.generic[OFS_PARM0] = playercolor; prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict); - PRVM_ExecuteProgram (SV_ChangeTeam, "QC function SV_ChangeTeam is missing"); + PRVM_ExecuteProgram(prog->funcoffsets.SV_ChangeTeam, "QC function SV_ChangeTeam is missing"); } else { prvm_eval_t *val; if (host_client->edict) { - if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors))) + if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.clientcolors))) val->_float = playercolor; host_client->edict->fields.server->team = bottom + 1; } @@ -1214,7 +1221,7 @@ void Host_BottomColor_f(void) 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)"}; +cvar_t cl_rate = {CVAR_SAVE | CVAR_NQUSERINFOHACK, "_cl_rate", "10000", "internal storage cvar for current rate (changed by rate command)"}; void Host_Rate_f(void) { int rate; @@ -1222,7 +1229,7 @@ void Host_Rate_f(void) if (Cmd_Argc() != 2) { Con_Printf("\"rate\" is \"%i\"\n", cl_rate.integer); - Con_Print("rate <500-25000>\n"); + Con_Print("rate \n"); return; } @@ -1230,8 +1237,7 @@ void Host_Rate_f(void) if (cmd_source == src_command) { - Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE)); - CL_SetInfo("rate", va("%i", rate), true, false, false, false); + Cvar_SetValue ("_cl_rate", max(NET_MINRATE, rate)); return; } @@ -1245,12 +1251,6 @@ Host_Kill_f */ void Host_Kill_f (void) { - if (cmd_source == src_command) - { - Cmd_ForwardToServer (); - return; - } - if (host_client->edict->fields.server->health <= 0) { SV_ClientPrint("Can't suicide -- already dead!\n"); @@ -1270,12 +1270,6 @@ Host_Pause_f */ void Host_Pause_f (void) { - - if (cmd_source == src_command) - { - Cmd_ForwardToServer (); - return; - } if (!pausable.integer) SV_ClientPrint("Pause not allowed.\n"); else @@ -1295,7 +1289,7 @@ LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mind LordHavoc: correction, Mindcrime will be removing pmodel in the future, but it's still stuck here for compatibility. ====================== */ -cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0", "internal storage cvar for current player model number in nehahra (changed by pmodel command)"}; +cvar_t cl_pmodel = {CVAR_SAVE | CVAR_NQUSERINFOHACK, "_cl_pmodel", "0", "internal storage cvar for current player model number in nehahra (changed by pmodel command)"}; static void Host_PModel_f (void) { int i; @@ -1318,7 +1312,7 @@ static void Host_PModel_f (void) return; } - if (host_client->edict && (val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_pmodel))) + if (host_client->edict && (val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.pmodel))) val->_float = i; } @@ -1332,12 +1326,6 @@ Host_PreSpawn_f */ void Host_PreSpawn_f (void) { - if (cmd_source == src_command) - { - Con_Print("prespawn is not valid from the console\n"); - return; - } - if (host_client->spawned) { Con_Print("prespawn not valid -- already spawned\n"); @@ -1364,16 +1352,8 @@ void Host_Spawn_f (void) { int i; client_t *client; - func_t RestoreGame; - mfunction_t *f; int stats[MAX_CL_STATS]; - if (cmd_source == src_command) - { - Con_Print("spawn is not valid from the console\n"); - return; - } - if (host_client->spawned) { Con_Print("Spawn not valid -- already spawned\n"); @@ -1396,13 +1376,12 @@ void Host_Spawn_f (void) // if this is the last client to be connected, unpause sv.paused = false; - if ((f = PRVM_ED_FindFunction ("RestoreGame"))) - if ((RestoreGame = (func_t)(f - prog->functions))) + if (prog->funcoffsets.RestoreGame) { Con_DPrint("Calling RestoreGame\n"); prog->globals.server->time = sv.time; prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict); - PRVM_ExecuteProgram (RestoreGame, "QC function RestoreGame is missing"); + PRVM_ExecuteProgram(prog->funcoffsets.RestoreGame, "QC function RestoreGame is missing"); } } else @@ -1510,14 +1489,6 @@ Host_Begin_f */ void Host_Begin_f (void) { - if (cmd_source == src_command) - { - Con_Print("begin is not valid from the console\n"); - return; - } - - Curl_SendRequirements(); - host_client->spawned = true; } @@ -1539,7 +1510,7 @@ void Host_Kick_f (void) int i; qboolean byNumber = false; - if (cmd_source != src_command || !sv.active) + if (!sv.active) return; SV_VM_Begin(); @@ -1582,7 +1553,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 # @@ -1623,12 +1594,6 @@ void Host_Give_f (void) int v; prvm_eval_t *val; - if (cmd_source == src_command) - { - Cmd_ForwardToServer (); - return; - } - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); @@ -1675,7 +1640,7 @@ void Host_Give_f (void) break; case 's': - if (gamemode == GAME_ROGUE && (val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_shells1))) + if (gamemode == GAME_ROGUE && (val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ammo_shells1))) val->_float = v; host_client->edict->fields.server->ammo_shells = v; @@ -1683,7 +1648,7 @@ void Host_Give_f (void) case 'n': if (gamemode == GAME_ROGUE) { - if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_nails1))) + if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ammo_nails1))) { val->_float = v; if (host_client->edict->fields.server->weapon <= IT_LIGHTNING) @@ -1698,7 +1663,7 @@ void Host_Give_f (void) case 'l': if (gamemode == GAME_ROGUE) { - val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_lava_nails); + val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ammo_lava_nails); if (val) { val->_float = v; @@ -1710,7 +1675,7 @@ void Host_Give_f (void) case 'r': if (gamemode == GAME_ROGUE) { - val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_rockets1); + val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ammo_rockets1); if (val) { val->_float = v; @@ -1726,7 +1691,7 @@ void Host_Give_f (void) case 'm': if (gamemode == GAME_ROGUE) { - val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_multi_rockets); + val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ammo_multi_rockets); if (val) { val->_float = v; @@ -1741,7 +1706,7 @@ void Host_Give_f (void) case 'c': if (gamemode == GAME_ROGUE) { - val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_cells1); + val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ammo_cells1); if (val) { val->_float = v; @@ -1757,7 +1722,7 @@ void Host_Give_f (void) case 'p': if (gamemode == GAME_ROGUE) { - val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_plasma); + val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ammo_plasma); if (val) { val->_float = v; @@ -1924,7 +1889,7 @@ void Host_Startdemos_f (void) { int i, c; - if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo") || COM_CheckParm("-demolooponly")) + if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo")) return; c = Cmd_Argc() - 1; @@ -1992,11 +1957,18 @@ void Host_SendCvar_f (void) if(Cmd_Argc() != 2) return; - if(!(c = Cvar_FindVar(Cmd_Argv(1))) || (c->flags & CVAR_PRIVATE)) + c = Cvar_FindVar(Cmd_Argv(1)); + if (cls.state == ca_connected) + { + // LordHavoc: if there is no such cvar or if it is private, send a + // reply indicating that it has no value + if(!c || (c->flags & CVAR_PRIVATE)) + Cmd_ForwardStringToServer(va("sentcvar %s\n", c->name)); + else + Cmd_ForwardStringToServer(va("sentcvar %s \"%s\"\n", c->name, c->string)); return; - if (cls.state != ca_dedicated) - Cmd_ForwardStringToServer(va("sentcvar %s %s\n", c->name, c->string)); - if(!sv.active)// || !SV_ParseClientCommandQC) + } + if(!sv.active)// || !prog->funcoffsets.SV_ParseClientCommand) return; old = host_client; @@ -2324,6 +2296,66 @@ 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 (!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)); + } +} + //============================================================================= /* @@ -2335,37 +2367,37 @@ void Host_InitCommands (void) { 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_WithClientCommand ("status", Host_Status_f, Host_Status_f, "print server status information"); Cmd_AddCommand ("quit", Host_Quit_f, "quit the game"); if (gamemode == GAME_NEHAHRA) { - Cmd_AddCommand ("max", Host_God_f, "god mode (invulnerability)"); - Cmd_AddCommand ("monster", Host_Notarget_f, "notarget mode (monsters do not see you)"); - Cmd_AddCommand ("scrag", Host_Fly_f, "fly mode (flight)"); - Cmd_AddCommand ("wraith", Host_Noclip_f, "noclip mode (flight without collisions, move through walls)"); - Cmd_AddCommand ("gimme", Host_Give_f, "alter inventory"); + Cmd_AddCommand_WithClientCommand ("max", NULL, Host_God_f, "god mode (invulnerability)"); + Cmd_AddCommand_WithClientCommand ("monster", NULL, Host_Notarget_f, "notarget mode (monsters do not see you)"); + Cmd_AddCommand_WithClientCommand ("scrag", NULL, Host_Fly_f, "fly mode (flight)"); + Cmd_AddCommand_WithClientCommand ("wraith", NULL, Host_Noclip_f, "noclip mode (flight without collisions, move through walls)"); + Cmd_AddCommand_WithClientCommand ("gimme", NULL, Host_Give_f, "alter inventory"); } else { - Cmd_AddCommand ("god", Host_God_f, "god mode (invulnerability)"); - Cmd_AddCommand ("notarget", Host_Notarget_f, "notarget mode (monsters do not see you)"); - Cmd_AddCommand ("fly", Host_Fly_f, "fly mode (flight)"); - Cmd_AddCommand ("noclip", Host_Noclip_f, "noclip mode (flight without collisions, move through walls)"); - Cmd_AddCommand ("give", Host_Give_f, "alter inventory"); + Cmd_AddCommand_WithClientCommand ("god", NULL, Host_God_f, "god mode (invulnerability)"); + Cmd_AddCommand_WithClientCommand ("notarget", NULL, Host_Notarget_f, "notarget mode (monsters do not see you)"); + Cmd_AddCommand_WithClientCommand ("fly", NULL, Host_Fly_f, "fly mode (flight)"); + Cmd_AddCommand_WithClientCommand ("noclip", NULL, Host_Noclip_f, "noclip mode (flight without collisions, move through walls)"); + Cmd_AddCommand_WithClientCommand ("give", NULL, Host_Give_f, "alter inventory"); } Cmd_AddCommand ("map", Host_Map_f, "kick everyone off the server and start a new level"); Cmd_AddCommand ("restart", Host_Restart_f, "restart current level"); Cmd_AddCommand ("changelevel", Host_Changelevel_f, "change to another level, bringing along all connected clients"); Cmd_AddCommand ("connect", Host_Connect_f, "connect to a server by IP address or hostname"); - Cmd_AddCommand ("reconnect", Host_Reconnect_f, "reset signon level in preparation for a new level (do not use)"); + Cmd_AddCommand ("reconnect", Host_Reconnect_f, "reconnect to the last server you were on, or resets a quakeworld connection (do not use if currently playing on a netquake server)"); Cmd_AddCommand ("version", Host_Version_f, "print engine version"); - Cmd_AddCommand ("say", Host_Say_f, "send a chat message to everyone on the server"); - Cmd_AddCommand ("say_team", Host_Say_Team_f, "send a chat message to your team on the server"); - Cmd_AddCommand ("tell", Host_Tell_f, "send a chat message to only one person on the server"); - Cmd_AddCommand ("kill", Host_Kill_f, "die instantly"); - Cmd_AddCommand ("pause", Host_Pause_f, "pause the game (if the server allows pausing)"); + Cmd_AddCommand_WithClientCommand ("say", Host_Say_f, Host_Say_f, "send a chat message to everyone on the server"); + Cmd_AddCommand_WithClientCommand ("say_team", Host_Say_Team_f, Host_Say_Team_f, "send a chat message to your team on the server"); + Cmd_AddCommand_WithClientCommand ("tell", Host_Tell_f, Host_Tell_f, "send a chat message to only one person on the server"); + Cmd_AddCommand_WithClientCommand ("kill", NULL, Host_Kill_f, "die instantly"); + Cmd_AddCommand_WithClientCommand ("pause", NULL, Host_Pause_f, "pause the game (if the server allows pausing)"); Cmd_AddCommand ("kick", Host_Kick_f, "kick a player off the server by number or name"); - Cmd_AddCommand ("ping", Host_Ping_f, "print ping times of all players on the server"); + Cmd_AddCommand_WithClientCommand ("ping", Host_Ping_f, Host_Ping_f, "print ping times of all players on the server"); Cmd_AddCommand ("load", Host_Loadgame_f, "load a saved game file"); Cmd_AddCommand ("save", Host_Savegame_f, "save the game to a file"); @@ -2379,29 +2411,29 @@ void Host_InitCommands (void) Cmd_AddCommand ("viewprev", Host_Viewprev_f, "change to previous animation frame of viewthing entity in current level"); Cvar_RegisterVariable (&cl_name); - Cmd_AddCommand ("name", Host_Name_f, "change your player name"); + Cmd_AddCommand_WithClientCommand ("name", Host_Name_f, Host_Name_f, "change your player name"); Cvar_RegisterVariable (&cl_color); - Cmd_AddCommand ("color", Host_Color_f, "change your player shirt and pants colors"); + Cmd_AddCommand_WithClientCommand ("color", Host_Color_f, Host_Color_f, "change your player shirt and pants colors"); Cvar_RegisterVariable (&cl_rate); - Cmd_AddCommand ("rate", Host_Rate_f, "change your network connection speed"); + Cmd_AddCommand_WithClientCommand ("rate", Host_Rate_f, Host_Rate_f, "change your network connection speed"); if (gamemode == GAME_NEHAHRA) { Cvar_RegisterVariable (&cl_pmodel); - Cmd_AddCommand ("pmodel", Host_PModel_f, "change your player model choice (Nehahra specific)"); + Cmd_AddCommand_WithClientCommand ("pmodel", Host_PModel_f, Host_PModel_f, "change your player model choice (Nehahra specific)"); } // BLACK: This isnt game specific anymore (it was GAME_NEXUIZ at first) Cvar_RegisterVariable (&cl_playermodel); - Cmd_AddCommand ("playermodel", Host_Playermodel_f, "change your player model"); + Cmd_AddCommand_WithClientCommand ("playermodel", Host_Playermodel_f, Host_Playermodel_f, "change your player model"); Cvar_RegisterVariable (&cl_playerskin); - Cmd_AddCommand ("playerskin", Host_Playerskin_f, "change your player skin number"); + Cmd_AddCommand_WithClientCommand ("playerskin", Host_Playerskin_f, Host_Playerskin_f, "change your player skin number"); - Cmd_AddCommand ("prespawn", Host_PreSpawn_f, "signon 1 (client acknowledges that server information has been received)"); - Cmd_AddCommand ("spawn", Host_Spawn_f, "signon 2 (client has sent player information, and is asking server to send scoreboard rankings)"); - Cmd_AddCommand ("begin", 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_WithClientCommand ("prespawn", NULL, Host_PreSpawn_f, "signon 1 (client acknowledges that server information has been received)"); + Cmd_AddCommand_WithClientCommand ("spawn", NULL, Host_Spawn_f, "signon 2 (client has sent player information, and is asking server to send scoreboard rankings)"); + 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); @@ -2415,10 +2447,14 @@ void Host_InitCommands (void) 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_WithClientCommand ("pings", NULL, 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); + Cvar_RegisterVariable(&sv_adminnick); }