X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=host_cmd.c;h=408592e28301ca4af00558e7ff5aef3d2c07d57c;hb=cd7454f9df6b152a24c5a28750041d27023fbc1f;hp=a6b67ca6306583fe8ac1b23fa0b3bc10e1ee4edf;hpb=8aeb4438ea5f178bb27f8359b8df325337cb51ba;p=xonotic%2Fdarkplaces.git diff --git a/host_cmd.c b/host_cmd.c index a6b67ca6..408592e2 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -19,13 +19,17 @@ 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"}; +cvar_t sv_cheats = {0, "sv_cheats", "0", "enables cheat commands in any game, and cheat impulses in dpmod"}; +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; -mfunction_t *ED_FindFunction (char *name); - /* ================== Host_Quit_f @@ -45,14 +49,14 @@ Host_Status_f */ void Host_Status_f (void) { - const char *protocolname; client_t *client; int seconds, minutes, hours = 0, j, players; void (*print) (const char *fmt, ...); 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; @@ -62,24 +66,17 @@ 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++; - print ("host: %s\n", Cvar_VariableString ("hostname")); - print ("version: %s build %s\n", gamename, buildstring); - switch(sv.protocol) - { - case PROTOCOL_QUAKE: protocolname = sv.netquakecompatible ? "QUAKE" : "QUAKEDP";break; - case PROTOCOL_DARKPLACES1: protocolname = "PROTOCOL_DARKPLACES1";break; - case PROTOCOL_DARKPLACES2: protocolname = "PROTOCOL_DARKPLACES2";break; - case PROTOCOL_DARKPLACES3: protocolname = "PROTOCOL_DARKPLACES3";break; - case PROTOCOL_DARKPLACES4: protocolname = "PROTOCOL_DARKPLACES4";break; - case PROTOCOL_DARKPLACES5: protocolname = "PROTOCOL_DARKPLACES5";break; - default: protocolname = "PROTOCOL_UNKNOWN";break; - } - print ("protocol: %i (%s)\n", sv.protocol, protocolname); - print ("map: %s\n", sv.name); - print ("players: %i active (%i max)\n\n", players, svs.maxclients); + print ("host: %s\n", Cvar_VariableString ("hostname")); + print ("version: %s build %s\n", gamename, buildstring); + print ("protocol: %i (%s)\n", Protocol_NumberForEnum(sv.protocol), Protocol_NameForEnum(sv.protocol)); + print ("map: %s\n", sv.name); + print ("players: %i active (%i max)\n\n", players, svs.maxclients); for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) { if (!client->active) @@ -95,8 +92,8 @@ void Host_Status_f (void) } else hours = 0; - print ("#%-2u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v->frags, hours, minutes, seconds); - print (" %s\n", client->netconnection->address); + 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"); } } @@ -116,17 +113,14 @@ void Host_God_f (void) return; } - if (!sv_player) - return; - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); return; } - sv_player->v->flags = (int)sv_player->v->flags ^ FL_GODMODE; - if (!((int)sv_player->v->flags & FL_GODMODE) ) + host_client->edict->fields.server->flags = (int)host_client->edict->fields.server->flags ^ FL_GODMODE; + if (!((int)host_client->edict->fields.server->flags & FL_GODMODE) ) SV_ClientPrint("godmode OFF\n"); else SV_ClientPrint("godmode ON\n"); @@ -140,17 +134,14 @@ void Host_Notarget_f (void) return; } - if (!sv_player) - return; - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); return; } - sv_player->v->flags = (int)sv_player->v->flags ^ FL_NOTARGET; - if (!((int)sv_player->v->flags & FL_NOTARGET) ) + host_client->edict->fields.server->flags = (int)host_client->edict->fields.server->flags ^ FL_NOTARGET; + if (!((int)host_client->edict->fields.server->flags & FL_NOTARGET) ) SV_ClientPrint("notarget OFF\n"); else SV_ClientPrint("notarget ON\n"); @@ -166,25 +157,22 @@ void Host_Noclip_f (void) return; } - if (!sv_player) - return; - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); return; } - if (sv_player->v->movetype != MOVETYPE_NOCLIP) + if (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP) { noclip_anglehack = true; - sv_player->v->movetype = MOVETYPE_NOCLIP; + host_client->edict->fields.server->movetype = MOVETYPE_NOCLIP; SV_ClientPrint("noclip ON\n"); } else { noclip_anglehack = false; - sv_player->v->movetype = MOVETYPE_WALK; + host_client->edict->fields.server->movetype = MOVETYPE_WALK; SV_ClientPrint("noclip OFF\n"); } } @@ -204,23 +192,20 @@ void Host_Fly_f (void) return; } - if (!sv_player) - return; - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); return; } - if (sv_player->v->movetype != MOVETYPE_FLY) + if (host_client->edict->fields.server->movetype != MOVETYPE_FLY) { - sv_player->v->movetype = MOVETYPE_FLY; + host_client->edict->fields.server->movetype = MOVETYPE_FLY; SV_ClientPrint("flymode ON\n"); } else { - sv_player->v->movetype = MOVETYPE_WALK; + host_client->edict->fields.server->movetype = MOVETYPE_WALK; SV_ClientPrint("flymode OFF\n"); } } @@ -232,29 +217,39 @@ Host_Ping_f ================== */ +void Host_Pings_f (void); // called by Host_Ping_f void Host_Ping_f (void) { - int i, j; - float total; - client_t *client; + int i; + client_t *client; + void (*print) (const char *fmt, ...); if (cmd_source == src_command) { - Cmd_ForwardToServer (); - return; + // 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; + } + print = Con_Printf; } + else + print = SV_ClientPrintf; + + if (!sv.active) + return; - SV_ClientPrint("Client ping times:\n"); + print("Client ping times:\n"); for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) { if (!client->active) continue; - total = 0; - for (j=0 ; jping_times[j]; - total /= NUM_PING_TIMES; - SV_ClientPrintf("%4i %s\n", (int)(total*1000), client->name); + 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(); } /* @@ -287,22 +282,43 @@ void Host_Map_f (void) if (cmd_source != src_command) return; - SCR_BeginLoadingPlaque (); cls.demonum = -1; // stop demo loop in case this fails CL_Disconnect (); - Host_ShutdownServer(false); + 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; - 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 } /* @@ -315,28 +331,28 @@ Goes to a new map, taking all clients along void Host_Changelevel_f (void) { char level[MAX_QPATH]; - + if (Cmd_Argc() != 2) { Con_Print("changelevel : continue game on a new level\n"); return; } - if (!sv.active || cls.demoplayback) - { - Con_Print("Only the server may changelevel\n"); + // HACKHACKHACK + if (!sv.active) { + Host_Map_f(); return; } if (cmd_source != src_command) return; - // remove console or menu + // remove menu key_dest = key_game; - key_consoleactive = 0; + SV_VM_Begin(); SV_SaveSpawnparms (); - SCR_BeginLoadingPlaque(); + 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"); @@ -352,13 +368,13 @@ Restarts the current server for a dead player void Host_Restart_f (void) { char mapname[MAX_QPATH]; - + if (Cmd_Argc() != 1) { Con_Print("restart : restart current level\n"); return; } - if (!sv.active || cls.demoplayback) + if (!sv.active) { Con_Print("Only the server may restart\n"); return; @@ -366,13 +382,11 @@ void Host_Restart_f (void) if (cmd_source != src_command) return; - // remove console or menu + // remove menu key_dest = key_game; - key_consoleactive = 0; - SCR_BeginLoadingPlaque(); 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"); @@ -388,18 +402,48 @@ This is sent just before a server changes levels */ void Host_Reconnect_f (void) { - 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 + { + 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"); + } + } } - 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 } - SCR_BeginLoadingPlaque(); - cls.signon = 0; // need new connection messages } /* @@ -444,12 +488,14 @@ void Host_SavegameComment (char *text) for (i=0 ; iv->deadflag) + if (svs.clients[i].edict->fields.server->deadflag) { Con_Print("Can't savegame with a dead player\n"); return; @@ -515,7 +561,7 @@ void Host_Savegame_f (void) FS_DefaultExtension (name, ".sav", sizeof (name)); Con_Printf("Saving game to %s...\n", name); - f = FS_Open (name, "w", false); + f = FS_Open (name, "wb", false, false); if (!f) { Con_Print("ERROR: couldn't open.\n"); @@ -531,30 +577,28 @@ void Host_Savegame_f (void) FS_Printf(f, "%s\n", sv.name); FS_Printf(f, "%f\n",sv.time); -// write the light styles - + // write the light styles for (i=0 ; inum_edicts ; i++) + PRVM_ED_Write (f, PRVM_EDICT_NUM(i)); + + SV_VM_End(); - ED_WriteGlobals (f); - for (i=0 ; i= MAX_EDICTS) - Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)\n", MAX_EDICTS); - while (entnum >= sv.max_edicts) - SV_IncreaseEdicts(); - ent = EDICT_NUM(entnum); - memset (ent->v, 0, progs->entityfields * 4); - ent->e->free = false; - ED_ParseEdict (start, ent); + { + Mem_Free(text); + Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)", MAX_EDICTS); + } + while (entnum >= prog->max_edicts) + //SV_IncreaseEdicts(); + PRVM_MEM_IncreaseEdicts(); + ent = PRVM_EDICT_NUM(entnum); + memset (ent->fields.server, 0, prog->progs->entityfields * 4); + ent->priv.server->free = false; + PRVM_ED_ParseEdict (start, ent); // link it into the bsp tree - if (!ent->e->free) + if (!ent->priv.server->free) SV_LinkEdict (ent, false); } entnum++; } + Mem_Free(text); - sv.num_edicts = entnum; + prog->num_edicts = entnum; sv.time = time; - FS_Close (f); - for (i = 0;i < NUM_SPAWN_PARMS;i++) svs.clients[0].spawn_parms[i] = spawn_parms[i]; + SV_VM_End(); + // make sure we're connected to loopback if (cls.state == ca_disconnected || !(cls.state == ca_connected && cls.netcon != NULL && LHNETADDRESS_GetAddressType(&cls.netcon->peeraddress) == LHNETADDRESSTYPE_LOOP)) CL_EstablishConnection("local:1"); @@ -719,7 +791,7 @@ void Host_Loadgame_f (void) Host_Name_f ====================== */ -cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"}; +cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player", "internal storage cvar for current player name (changed by name command)"}; void Host_Name_f (void) { int i, j; @@ -744,8 +816,7 @@ void Host_Name_f (void) if (cmd_source == src_command) { Cvar_Set ("_cl_name", newName); - if (cls.state == ca_connected) - Cmd_ForwardToServer (); + CL_SetInfo("name", newName, true, false, false, false); return; } @@ -754,17 +825,17 @@ void Host_Name_f (void) SV_ClientPrintf("You can't change name more than once every 5 seconds!\n"); return; } - + host_client->nametime = sv.time + 5; // point the string back at updateclient->name to keep it safe strlcpy (host_client->name, newName, sizeof (host_client->name)); - host_client->edict->v->netname = PR_SetString(host_client->name); + host_client->edict->fields.server->netname = PRVM_SetEngineString(host_client->name); if (strcmp(host_client->old_name, host_client->name)) { 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); @@ -772,6 +843,124 @@ 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)"}; +// the old cl_playermodel in cl_main has been renamed to __cl_playermodel +void Host_Playermodel_f (void) +{ + int i, j; + char newPath[sizeof(host_client->playermodel)]; + + if (Cmd_Argc () == 1) + { + Con_Printf("\"playermodel\" is \"%s\"\n", cl_playermodel.string); + return; + } + + if (Cmd_Argc () == 2) + strlcpy (newPath, Cmd_Argv(1), sizeof (newPath)); + else + strlcpy (newPath, Cmd_Args(), 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 (cmd_source == src_command) + { + Cvar_Set ("_cl_playermodel", newPath); + CL_SetInfo("playermodel", newPath, true, false, false, false); + return; + } + + /* + if (sv.time < host_client->nametime) + { + SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n"); + return; + } + + host_client->nametime = sv.time + 5; + */ + + // 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 (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);*/ + } +} + +/* +====================== +Host_Playerskin_f +====================== +*/ +cvar_t cl_playerskin = {CVAR_SAVE, "_cl_playerskin", "", "internal storage cvar for current player skin in Nexuiz (changed by playerskin command)"}; +void Host_Playerskin_f (void) +{ + int i, j; + char newPath[sizeof(host_client->playerskin)]; + + if (Cmd_Argc () == 1) + { + Con_Printf("\"playerskin\" is \"%s\"\n", cl_playerskin.string); + return; + } + + if (Cmd_Argc () == 2) + strlcpy (newPath, Cmd_Argv(1), sizeof (newPath)); + else + strlcpy (newPath, Cmd_Args(), 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 (cmd_source == src_command) + { + Cvar_Set ("_cl_playerskin", newPath); + CL_SetInfo("playerskin", newPath, true, false, false, false); + return; + } + + /* + if (sv.time < host_client->nametime) + { + SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n"); + return; + } + + host_client->nametime = sv.time + 5; + */ + + // 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 (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); + 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);*/ + } +} void Host_Version_f (void) { @@ -784,8 +973,8 @@ void Host_Say(qboolean teamonly) int j, quoted; const char *p1; char *p2; - // LordHavoc: 256 char say messages - unsigned char text[256]; + // LordHavoc: long say messages + char text[1024]; qboolean fromServer = false; if (cmd_source == src_command) @@ -808,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 == '\"') @@ -816,10 +1004,11 @@ void Host_Say(qboolean teamonly) quoted = true; p1++; } + // note this uses the chat prefix \001 if (!fromServer) - snprintf (text, sizeof(text), "%c%s: %s", 1, host_client->name, p1); + dpsnprintf (text, sizeof(text), "\001%s" STRING_COLOR_DEFAULT_STR ": %s", host_client->name, p1); else - snprintf (text, sizeof(text), "%c<%s> %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))) { @@ -833,11 +1022,12 @@ 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->v->team == save->edict->v->team)) + if (host_client->spawned && (!teamonly || host_client->edict->fields.server->team == save->edict->fields.server->team)) SV_ClientPrint(text); host_client = save; - Sys_Print(&text[1]); + if (cls.state == ca_dedicated) + Con_Print(&text[1]); } @@ -858,7 +1048,7 @@ void Host_Tell_f(void) client_t *save; int j; const char *p1, *p2; - char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64) + char text[MAX_INPUTLINE]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64) qboolean fromServer = false; if (cmd_source == src_command) @@ -875,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); @@ -903,7 +1094,7 @@ void Host_Tell_f(void) } while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) p2--; - for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;) + for (j = (int)strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;) text[j++] = *p1++; text[j++] = '\n'; text[j++] = 0; @@ -921,64 +1112,62 @@ void Host_Tell_f(void) Host_Color_f ================== */ -cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0"}; -void Host_Color_f(void) +cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0", "internal storage cvar for current player colors (changed by color command)"}; +void Host_Color(int changetop, int changebottom) { - int top, bottom; - int playercolor; + int top, bottom, playercolor; mfunction_t *f; - 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; - } + func_t SV_ChangeTeam; - 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); - if (cls.state == ca_connected) - 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; } - if (sv_player && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions))) + 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"); - pr_global_struct->time = sv.time; - pr_globals[OFS_PARM0] = playercolor; - pr_global_struct->self = EDICT_TO_PROG(sv_player); - PR_ExecuteProgram (SV_ChangeTeam, "QC function SV_ChangeTeam is missing"); + 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"); } else { - eval_t *val; - if (sv_player) + prvm_eval_t *val; + if (host_client->edict) { - if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors))) + if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors))) val->_float = playercolor; - sv_player->v->team = bottom + 1; + host_client->edict->fields.server->team = bottom + 1; } host_client->colors = playercolor; if (host_client->old_colors != host_client->colors) @@ -992,7 +1181,52 @@ void Host_Color_f(void) } } -cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000"}; +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) { int rate; @@ -1009,8 +1243,7 @@ void Host_Rate_f(void) if (cmd_source == src_command) { Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE)); - if (cls.state == ca_connected) - Cmd_ForwardToServer (); + CL_SetInfo("rate", va("%i", rate), true, false, false, false); return; } @@ -1030,15 +1263,15 @@ void Host_Kill_f (void) return; } - if (!sv_player || sv_player->v->health <= 0) + if (host_client->edict->fields.server->health <= 0) { SV_ClientPrint("Can't suicide -- already dead!\n"); return; } - pr_global_struct->time = sv.time; - pr_global_struct->self = EDICT_TO_PROG(host_client->edict); - PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing"); + prog->globals.server->time = sv.time; + prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict); + PRVM_ExecuteProgram (prog->globals.server->ClientKill, "QC function ClientKill is missing"); } @@ -1071,13 +1304,14 @@ void Host_Pause_f (void) ====================== Host_PModel_f LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen. +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"}; +cvar_t cl_pmodel = {CVAR_SAVE, "_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; - eval_t *val; + prvm_eval_t *val; if (Cmd_Argc () == 1) { @@ -1096,7 +1330,7 @@ static void Host_PModel_f (void) return; } - if (sv_player && (val = GETEDICTFIELDVALUE(sv_player, eval_pmodel))) + if (host_client->edict && (val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_pmodel))) val->_float = i; } @@ -1122,10 +1356,12 @@ void Host_PreSpawn_f (void) return; } - SZ_Write (&host_client->message, sv.signon.data, sv.signon.cursize); - MSG_WriteByte (&host_client->message, svc_signonnum); - MSG_WriteByte (&host_client->message, 2); - host_client->sendsignon = true; + if (host_client->netconnection) + { + SZ_Write (&host_client->netconnection->message, sv.signon.data, sv.signon.cursize); + MSG_WriteByte (&host_client->netconnection->message, svc_signonnum); + MSG_WriteByte (&host_client->netconnection->message, 2); + } // reset the name change timer because the client will send name soon host_client->nametime = 0; @@ -1142,6 +1378,7 @@ void Host_Spawn_f (void) client_t *client; func_t RestoreGame; mfunction_t *f; + int stats[MAX_CL_STATS]; if (cmd_source == src_command) { @@ -1155,19 +1392,14 @@ void Host_Spawn_f (void) return; } - if (!sv_player) - { - Con_Print("Host_Spawn: no edict??\n"); - return; - } - // reset name change timer again because they might want to change name // again in the first 5 seconds after connecting host_client->nametime = 0; // LordHavoc: moved this above the QC calls at FrikaC's request - // send all current names, colors, and frag counts - SZ_Clear (&host_client->message); + // LordHavoc: commented this out + //if (host_client->netconnection) + // SZ_Clear (&host_client->netconnection->message); // run the entrance script if (sv.loadgame) @@ -1176,97 +1408,111 @@ void Host_Spawn_f (void) // if this is the last client to be connected, unpause sv.paused = false; - if ((f = ED_FindFunction ("RestoreGame"))) - if ((RestoreGame = (func_t)(f - pr_functions))) + if ((f = PRVM_ED_FindFunction ("RestoreGame"))) + if ((RestoreGame = (func_t)(f - prog->functions))) { Con_DPrint("Calling RestoreGame\n"); - pr_global_struct->time = sv.time; - pr_global_struct->self = EDICT_TO_PROG(sv_player); - PR_ExecuteProgram (RestoreGame, "QC function RestoreGame is missing"); + 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"); } } else { - // set up the edict - ED_ClearEdict(sv_player); - - //Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, sv_player->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(sv_player->v->netname), host_client->name); + //Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, host_client->edict->netname = %s, host_client->name = %s\n", PRVM_GetString(host_client->edict->fields.server->netname), PRVM_GetString(host_client->edict->fields.server->netname), host_client->name); // copy spawn parms out of the client_t for (i=0 ; i< NUM_SPAWN_PARMS ; i++) - (&pr_global_struct->parm1)[i] = host_client->spawn_parms[i]; + (&prog->globals.server->parm1)[i] = host_client->spawn_parms[i]; // call the spawn function - pr_global_struct->time = sv.time; - pr_global_struct->self = EDICT_TO_PROG(sv_player); - PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing"); + host_client->clientconnectcalled = true; + prog->globals.server->time = sv.time; + 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) - Sys_Printf("%s entered the game\n", host_client->name); + Con_Printf("%s entered the game\n", host_client->name); - PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing"); + PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing"); } + if (!host_client->netconnection) + return; // send time of update - MSG_WriteByte (&host_client->message, svc_time); - MSG_WriteFloat (&host_client->message, sv.time); + MSG_WriteByte (&host_client->netconnection->message, svc_time); + MSG_WriteFloat (&host_client->netconnection->message, sv.time); + // send all current names, colors, and frag counts for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) { if (!client->active) continue; - MSG_WriteByte (&host_client->message, svc_updatename); - MSG_WriteByte (&host_client->message, i); - MSG_WriteString (&host_client->message, client->name); - MSG_WriteByte (&host_client->message, svc_updatefrags); - MSG_WriteByte (&host_client->message, i); - MSG_WriteShort (&host_client->message, client->frags); - MSG_WriteByte (&host_client->message, svc_updatecolors); - MSG_WriteByte (&host_client->message, i); - MSG_WriteByte (&host_client->message, client->colors); + MSG_WriteByte (&host_client->netconnection->message, svc_updatename); + MSG_WriteByte (&host_client->netconnection->message, i); + MSG_WriteString (&host_client->netconnection->message, client->name); + MSG_WriteByte (&host_client->netconnection->message, svc_updatefrags); + MSG_WriteByte (&host_client->netconnection->message, i); + MSG_WriteShort (&host_client->netconnection->message, client->frags); + MSG_WriteByte (&host_client->netconnection->message, svc_updatecolors); + MSG_WriteByte (&host_client->netconnection->message, i); + MSG_WriteByte (&host_client->netconnection->message, client->colors); } // send all current light styles for (i=0 ; imessage, svc_lightstyle); - MSG_WriteByte (&host_client->message, (char)i); - MSG_WriteString (&host_client->message, sv.lightstyles[i]); + if (sv.lightstyles[i][0]) + { + MSG_WriteByte (&host_client->netconnection->message, svc_lightstyle); + MSG_WriteByte (&host_client->netconnection->message, (char)i); + MSG_WriteString (&host_client->netconnection->message, sv.lightstyles[i]); + } } // send some stats - MSG_WriteByte (&host_client->message, svc_updatestat); - MSG_WriteByte (&host_client->message, STAT_TOTALSECRETS); - MSG_WriteLong (&host_client->message, pr_global_struct->total_secrets); + MSG_WriteByte (&host_client->netconnection->message, svc_updatestat); + MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALSECRETS); + MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_secrets); - MSG_WriteByte (&host_client->message, svc_updatestat); - MSG_WriteByte (&host_client->message, STAT_TOTALMONSTERS); - MSG_WriteLong (&host_client->message, pr_global_struct->total_monsters); + MSG_WriteByte (&host_client->netconnection->message, svc_updatestat); + MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALMONSTERS); + MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_monsters); - MSG_WriteByte (&host_client->message, svc_updatestat); - MSG_WriteByte (&host_client->message, STAT_SECRETS); - MSG_WriteLong (&host_client->message, pr_global_struct->found_secrets); + MSG_WriteByte (&host_client->netconnection->message, svc_updatestat); + MSG_WriteByte (&host_client->netconnection->message, STAT_SECRETS); + MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->found_secrets); - MSG_WriteByte (&host_client->message, svc_updatestat); - MSG_WriteByte (&host_client->message, STAT_MONSTERS); - MSG_WriteLong (&host_client->message, pr_global_struct->killed_monsters); + MSG_WriteByte (&host_client->netconnection->message, svc_updatestat); + MSG_WriteByte (&host_client->netconnection->message, STAT_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->message, svc_setangle); - MSG_WriteAngle (&host_client->message, sv_player->v->angles[0], sv.protocol); - MSG_WriteAngle (&host_client->message, sv_player->v->angles[1], sv.protocol); - MSG_WriteAngle (&host_client->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 (sv_player, &host_client->message); + SV_WriteClientdataToMessage (host_client, host_client->edict, &host_client->netconnection->message, stats); - MSG_WriteByte (&host_client->message, svc_signonnum); - MSG_WriteByte (&host_client->message, 3); - host_client->sendsignon = true; + MSG_WriteByte (&host_client->netconnection->message, svc_signonnum); + MSG_WriteByte (&host_client->netconnection->message, 3); } /* @@ -1282,6 +1528,8 @@ void Host_Begin_f (void) return; } + Curl_SendRequirements(); + host_client->spawned = true; } @@ -1306,11 +1554,12 @@ void Host_Kick_f (void) if (cmd_source != src_command || !sv.active) return; + SV_VM_Begin(); save = host_client; 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; @@ -1345,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 # @@ -1364,6 +1613,7 @@ void Host_Kick_f (void) } host_client = save; + SV_VM_End(); } /* @@ -1383,7 +1633,7 @@ void Host_Give_f (void) { const char *t; int v; - eval_t *val; + prvm_eval_t *val; if (cmd_source == src_command) { @@ -1391,9 +1641,6 @@ void Host_Give_f (void) return; } - if (!sv_player) - return; - if (!allowcheats) { SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); @@ -1421,128 +1668,128 @@ void Host_Give_f (void) if (t[0] == '6') { if (t[1] == 'a') - sv_player->v->items = (int)sv_player->v->items | HIT_PROXIMITY_GUN; + host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | HIT_PROXIMITY_GUN; else - sv_player->v->items = (int)sv_player->v->items | IT_GRENADE_LAUNCHER; + host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | IT_GRENADE_LAUNCHER; } else if (t[0] == '9') - sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON; + host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | HIT_LASER_CANNON; else if (t[0] == '0') - sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR; + host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | HIT_MJOLNIR; else if (t[0] >= '2') - sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2')); + host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | (IT_SHOTGUN << (t[0] - '2')); } else { if (t[0] >= '2') - sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2')); + host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | (IT_SHOTGUN << (t[0] - '2')); } break; case 's': - if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))) + if (gamemode == GAME_ROGUE && (val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_shells1))) val->_float = v; - sv_player->v->ammo_shells = v; + host_client->edict->fields.server->ammo_shells = v; break; case 'n': if (gamemode == GAME_ROGUE) { - if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1))) + if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_nails1))) { val->_float = v; - if (sv_player->v->weapon <= IT_LIGHTNING) - sv_player->v->ammo_nails = v; + if (host_client->edict->fields.server->weapon <= IT_LIGHTNING) + host_client->edict->fields.server->ammo_nails = v; } } else { - sv_player->v->ammo_nails = v; + host_client->edict->fields.server->ammo_nails = v; } break; case 'l': if (gamemode == GAME_ROGUE) { - val = GETEDICTFIELDVALUE(sv_player, eval_ammo_lava_nails); + val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_lava_nails); if (val) { val->_float = v; - if (sv_player->v->weapon > IT_LIGHTNING) - sv_player->v->ammo_nails = v; + if (host_client->edict->fields.server->weapon > IT_LIGHTNING) + host_client->edict->fields.server->ammo_nails = v; } } break; case 'r': if (gamemode == GAME_ROGUE) { - val = GETEDICTFIELDVALUE(sv_player, eval_ammo_rockets1); + val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_rockets1); if (val) { val->_float = v; - if (sv_player->v->weapon <= IT_LIGHTNING) - sv_player->v->ammo_rockets = v; + if (host_client->edict->fields.server->weapon <= IT_LIGHTNING) + host_client->edict->fields.server->ammo_rockets = v; } } else { - sv_player->v->ammo_rockets = v; + host_client->edict->fields.server->ammo_rockets = v; } break; case 'm': if (gamemode == GAME_ROGUE) { - val = GETEDICTFIELDVALUE(sv_player, eval_ammo_multi_rockets); + val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_multi_rockets); if (val) { val->_float = v; - if (sv_player->v->weapon > IT_LIGHTNING) - sv_player->v->ammo_rockets = v; + if (host_client->edict->fields.server->weapon > IT_LIGHTNING) + host_client->edict->fields.server->ammo_rockets = v; } } break; case 'h': - sv_player->v->health = v; + host_client->edict->fields.server->health = v; break; case 'c': if (gamemode == GAME_ROGUE) { - val = GETEDICTFIELDVALUE(sv_player, eval_ammo_cells1); + val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_cells1); if (val) { val->_float = v; - if (sv_player->v->weapon <= IT_LIGHTNING) - sv_player->v->ammo_cells = v; + if (host_client->edict->fields.server->weapon <= IT_LIGHTNING) + host_client->edict->fields.server->ammo_cells = v; } } else { - sv_player->v->ammo_cells = v; + host_client->edict->fields.server->ammo_cells = v; } break; case 'p': if (gamemode == GAME_ROGUE) { - val = GETEDICTFIELDVALUE(sv_player, eval_ammo_plasma); + val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_plasma); if (val) { val->_float = v; - if (sv_player->v->weapon > IT_LIGHTNING) - sv_player->v->ammo_cells = v; + if (host_client->edict->fields.server->weapon > IT_LIGHTNING) + host_client->edict->fields.server->ammo_cells = v; } } break; } } -edict_t *FindViewthing (void) +prvm_edict_t *FindViewthing (void) { int i; - edict_t *e; + prvm_edict_t *e; - for (i=0 ; inum_edicts ; i++) { - e = EDICT_NUM(i); - if (!strcmp (PR_GetString(e->v->classname), "viewthing")) + e = PRVM_EDICT_NUM(i); + if (!strcmp (PRVM_GetString(e->fields.server->classname), "viewthing")) return e; } Con_Print("No viewthing on map\n"); @@ -1556,22 +1803,27 @@ Host_Viewmodel_f */ void Host_Viewmodel_f (void) { - edict_t *e; + prvm_edict_t *e; model_t *m; + if (!sv.active) + return; + + SV_VM_Begin(); e = FindViewthing (); + SV_VM_End(); if (!e) return; m = Mod_ForName (Cmd_Argv(1), false, true, false); - if (!m) + if (!m || !m->loaded || !m->Draw) { - Con_Printf("Can't load %s\n", Cmd_Argv(1)); + Con_Printf("viewmodel: can't load %s\n", Cmd_Argv(1)); return; } - e->v->frame = 0; - cl.model_precache[(int)e->v->modelindex] = m; + e->fields.server->frame = 0; + cl.model_precache[(int)e->fields.server->modelindex] = m; } /* @@ -1581,20 +1833,25 @@ Host_Viewframe_f */ void Host_Viewframe_f (void) { - edict_t *e; + prvm_edict_t *e; int f; model_t *m; + if (!sv.active) + return; + + SV_VM_Begin(); e = FindViewthing (); + SV_VM_End(); if (!e) return; - m = cl.model_precache[(int)e->v->modelindex]; + m = cl.model_precache[(int)e->fields.server->modelindex]; f = atoi(Cmd_Argv(1)); if (f >= m->numframes) f = m->numframes-1; - e->v->frame = f; + e->fields.server->frame = f; } @@ -1613,19 +1870,24 @@ Host_Viewnext_f */ void Host_Viewnext_f (void) { - edict_t *e; + prvm_edict_t *e; model_t *m; + if (!sv.active) + return; + + SV_VM_Begin(); e = FindViewthing (); + SV_VM_End(); if (!e) return; - m = cl.model_precache[(int)e->v->modelindex]; + m = cl.model_precache[(int)e->fields.server->modelindex]; - e->v->frame = e->v->frame + 1; - if (e->v->frame >= m->numframes) - e->v->frame = m->numframes - 1; + e->fields.server->frame = e->fields.server->frame + 1; + if (e->fields.server->frame >= m->numframes) + e->fields.server->frame = m->numframes - 1; - PrintFrameName (m, e->v->frame); + PrintFrameName (m, (int)e->fields.server->frame); } /* @@ -1635,20 +1897,25 @@ Host_Viewprev_f */ void Host_Viewprev_f (void) { - edict_t *e; + prvm_edict_t *e; model_t *m; + if (!sv.active) + return; + + SV_VM_Begin(); e = FindViewthing (); + SV_VM_End(); if (!e) return; - m = cl.model_precache[(int)e->v->modelindex]; + m = cl.model_precache[(int)e->fields.server->modelindex]; - e->v->frame = e->v->frame - 1; - if (e->v->frame < 0) - e->v->frame = 0; + e->fields.server->frame = e->fields.server->frame - 1; + if (e->fields.server->frame < 0) + e->fields.server->frame = 0; - PrintFrameName (m, e->v->frame); + PrintFrameName (m, (int)e->fields.server->frame); } /* @@ -1669,7 +1936,7 @@ void Host_Startdemos_f (void) { int i, c; - if (cls.state == ca_dedicated || COM_CheckParm("-listen")) + if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo") || COM_CheckParm("-demolooponly")) return; c = Cmd_Argc() - 1; @@ -1678,7 +1945,7 @@ void Host_Startdemos_f (void) Con_Printf("Max %i demos in demoloop\n", MAX_DEMOS); c = MAX_DEMOS; } - Con_DPrintf("%i demo(s) in loop\n", c); + Con_Printf("%i demo(s) in loop\n", c); for (i=1 ; iflags & CVAR_PRIVATE)) + return; + if (cls.state != ca_dedicated) + Cmd_ForwardStringToServer(va("sentcvar %s %s\n", c->name, c->string)); + if(!sv.active)// || !SV_ParseClientCommandQC) + return; + + old = host_client; + if (cls.state != ca_dedicated) + i = 1; + else + i = 0; + for(;iname)); + } + host_client = old; } static void MaxPlayers_f(void) @@ -1752,7 +2048,7 @@ static void MaxPlayers_f(void) if (svs.clients) Mem_Free(svs.clients); svs.maxclients = n; - svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients); + svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients); if (n == 1) Cvar_Set ("deathmatch", "0"); else @@ -1761,6 +2057,352 @@ static void MaxPlayers_f(void) //============================================================================= +// QuakeWorld commands + +/* +===================== +Host_Rcon_f + + Send the rest of the command line over as + an unconnected command. +===================== +*/ +void Host_Rcon_f (void) // credit: taken from QuakeWorld +{ + int i; + lhnetaddress_t to; + lhnetsocket_t *mysocket; + + if (!rcon_password.string || !rcon_password.string[0]) + { + Con_Printf ("You must set rcon_password before issuing an rcon command.\n"); + return; + } + + for (i = 0;rcon_password.string[i];i++) + { + if (rcon_password.string[i] <= ' ') + { + Con_Printf("rcon_password is not allowed to have any whitespace.\n"); + return; + } + } + + if (cls.netcon) + to = cls.netcon->peeraddress; + else + { + if (!rcon_address.string[0]) + { + Con_Printf ("You must either be connected, or set the rcon_address cvar to issue rcon commands\n"); + return; + } + LHNETADDRESS_FromString(&to, rcon_address.string, sv_netport.integer); + } + mysocket = NetConn_ChooseClientSocketForAddress(&to); + if (mysocket) + { + // simply put together the rcon packet and send it + NetConn_WriteString(mysocket, va("\377\377\377\377rcon %s %s", rcon_password.string, Cmd_Args()), &to); + } +} + +/* +==================== +Host_User_f + +user + +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 \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 \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 \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++; + + CL_SetInfo(key, value, false, false, false, false); + } +} + +/* +================== +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 [ ]\n"); + return; + } + CL_SetInfo(Cmd_Argv(1), Cmd_Argv(2), true, false, false, false); +} + +/* +==================== +Host_Packet_f + +packet + +Contents allows \n escape character +==================== +*/ +void Host_Packet_f (void) // credit: taken from QuakeWorld +{ + char send[2048]; + int i, l; + const char *in; + char *out; + lhnetaddress_t address; + lhnetsocket_t *mysocket; + + if (Cmd_Argc() != 3) + { + Con_Printf ("packet \n"); + return; + } + + if (!LHNETADDRESS_FromString (&address, Cmd_Argv(1), sv_netport.integer)) + { + Con_Printf ("Bad address\n"); + return; + } + + in = Cmd_Argv(2); + out = send+4; + send[0] = send[1] = send[2] = send[3] = 0xff; + + l = (int)strlen (in); + for (i=0 ; i= send + sizeof(send) - 1) + break; + if (in[i] == '\\' && in[i+1] == 'n') + { + *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]; + } + + mysocket = NetConn_ChooseClientSocketForAddress(&address); + if (mysocket) + 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)); + } +} + +//============================================================================= + /* ================== Host_InitCommands @@ -1768,64 +2410,94 @@ Host_InitCommands */ void Host_InitCommands (void) { - Cmd_AddCommand ("status", Host_Status_f); - Cmd_AddCommand ("quit", Host_Quit_f); + 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"); if (gamemode == GAME_NEHAHRA) { - Cmd_AddCommand ("max", Host_God_f); - Cmd_AddCommand ("monster", Host_Notarget_f); - Cmd_AddCommand ("scrag", Host_Fly_f); - Cmd_AddCommand ("wraith", Host_Noclip_f); - Cmd_AddCommand ("gimme", Host_Give_f); + 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"); } else { - Cmd_AddCommand ("god", Host_God_f); - Cmd_AddCommand ("notarget", Host_Notarget_f); - Cmd_AddCommand ("fly", Host_Fly_f); - Cmd_AddCommand ("noclip", Host_Noclip_f); - Cmd_AddCommand ("give", Host_Give_f); - } - Cmd_AddCommand ("map", Host_Map_f); - Cmd_AddCommand ("restart", Host_Restart_f); - Cmd_AddCommand ("changelevel", Host_Changelevel_f); - Cmd_AddCommand ("connect", Host_Connect_f); - Cmd_AddCommand ("reconnect", Host_Reconnect_f); - Cmd_AddCommand ("version", Host_Version_f); - Cmd_AddCommand ("say", Host_Say_f); - Cmd_AddCommand ("say_team", Host_Say_Team_f); - Cmd_AddCommand ("tell", Host_Tell_f); - Cmd_AddCommand ("kill", Host_Kill_f); - Cmd_AddCommand ("pause", Host_Pause_f); - Cmd_AddCommand ("kick", Host_Kick_f); - Cmd_AddCommand ("ping", Host_Ping_f); - Cmd_AddCommand ("load", Host_Loadgame_f); - Cmd_AddCommand ("save", Host_Savegame_f); - - Cmd_AddCommand ("startdemos", Host_Startdemos_f); - Cmd_AddCommand ("demos", Host_Demos_f); - Cmd_AddCommand ("stopdemo", Host_Stopdemo_f); - - Cmd_AddCommand ("viewmodel", Host_Viewmodel_f); - Cmd_AddCommand ("viewframe", Host_Viewframe_f); - Cmd_AddCommand ("viewnext", Host_Viewnext_f); - Cmd_AddCommand ("viewprev", Host_Viewprev_f); + 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 ("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 ("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 ("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 ("load", Host_Loadgame_f, "load a saved game file"); + Cmd_AddCommand ("save", Host_Savegame_f, "save the game to a file"); + + Cmd_AddCommand ("startdemos", Host_Startdemos_f, "start playing back the selected demos sequentially (used at end of startup script)"); + Cmd_AddCommand ("demos", Host_Demos_f, "restart looping demos defined by the last startdemos command"); + Cmd_AddCommand ("stopdemo", Host_Stopdemo_f, "stop playing or recording demo (like stop command) and return to looping demos"); + + Cmd_AddCommand ("viewmodel", Host_Viewmodel_f, "change model of viewthing entity in current level"); + Cmd_AddCommand ("viewframe", Host_Viewframe_f, "change animation frame of viewthing entity in current level"); + Cmd_AddCommand ("viewnext", Host_Viewnext_f, "change to next animation frame of viewthing entity in current level"); + 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); + Cmd_AddCommand ("name", Host_Name_f, "change your player name"); Cvar_RegisterVariable (&cl_color); - Cmd_AddCommand ("color", Host_Color_f); + Cmd_AddCommand ("color", Host_Color_f, "change your player shirt and pants colors"); Cvar_RegisterVariable (&cl_rate); - Cmd_AddCommand ("rate", Host_Rate_f); + Cmd_AddCommand ("rate", Host_Rate_f, "change your network connection speed"); if (gamemode == GAME_NEHAHRA) { Cvar_RegisterVariable (&cl_pmodel); - Cmd_AddCommand ("pmodel", Host_PModel_f); - } - Cmd_AddCommand ("prespawn", Host_PreSpawn_f); - Cmd_AddCommand ("spawn", Host_Spawn_f); - Cmd_AddCommand ("begin", Host_Begin_f); - Cmd_AddCommand ("maxplayers", MaxPlayers_f); + Cmd_AddCommand ("pmodel", 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"); + Cvar_RegisterVariable (&cl_playerskin); + Cmd_AddCommand ("playerskin", 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 ("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] + + 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"); + 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); }