X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=528af90a599c6503c00eec09d7532ebde48feac9;hb=ddb7747373ae239fb67996cffd6a7d2bdbb1cf6a;hp=7510ee753673dbbc5974a34e645ed826c1c6ecd5;hpb=d7035ef4229a2462ad59a67160494593fbd8f2e0;p=xonotic%2Fdarkplaces.git diff --git a/host_cmd.c b/host_cmd.c index 7510ee75..528af90a 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -20,13 +20,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -extern cvar_t pausable; +int current_skill; +char sv_spawnmap[MAX_QPATH]; +char sv_loadgame[MAX_OSPATH]; -int current_skill; +cvar_t sv_cheats = {0, "sv_cheats", "0"}; +qboolean allowcheats = false; -void Mod_Print (void); - -dfunction_t *ED_FindFunction (char *name); +mfunction_t *ED_FindFunction (char *name); /* ================== @@ -34,20 +35,12 @@ Host_Quit_f ================== */ -// LordHavoc: didn't like it asking me if I wanted to quit -//extern void M_Menu_Quit_f (void); - +extern qboolean host_shuttingdown; void Host_Quit_f (void) { - /* - if (key_dest != key_console && cls.state != ca_dedicated) - { - M_Menu_Quit_f (); - return; - } - */ + host_shuttingdown = true; CL_Disconnect (); - Host_ShutdownServer(false); + Host_ShutdownServer(false); Sys_Quit (); } @@ -60,13 +53,10 @@ Host_Status_f */ void Host_Status_f (void) { - client_t *client; - int seconds; - int minutes; - int hours = 0; - int j; - void (*print) (char *fmt, ...); - + client_t *client; + int seconds, minutes, hours = 0, j, players; + void (*print) (const char *fmt, ...); + if (cmd_source == src_command) { if (!sv.active) @@ -79,19 +69,18 @@ void Host_Status_f (void) else print = SV_ClientPrintf; + for (players = 0, j = 0;j < svs.maxclients;j++) + if (svs.clients[j].active) + players++; print ("host: %s\n", Cvar_VariableString ("hostname")); - print ("version: %4.2f (build %i)\n", VERSION, buildnumber); - if (tcpipAvailable) - print ("tcp/ip: %s\n", my_tcpip_address); - if (ipxAvailable) - print ("ipx: %s\n", my_ipx_address); + print ("version: %s build %s\n", gamename, buildstring); print ("map: %s\n", sv.name); - print ("players: %i active (%i max)\n\n", net_activeconnections, svs.maxclients); - for (j=0, client = svs.clients ; jactive) continue; - seconds = (int)(net_time - client->netconnection->connecttime); + seconds = (int)(realtime - client->netconnection->connecttime); minutes = seconds / 60; if (minutes) { @@ -102,7 +91,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->v.frags, hours, minutes, seconds); + 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); } } @@ -123,11 +112,17 @@ void Host_God_f (void) return; } - if (pr_global_struct->deathmatch) + if (!sv_player) return; - sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE; - if (!((int)sv_player->v.flags & FL_GODMODE) ) + if (!allowcheats) + { + SV_ClientPrintf("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) ) SV_ClientPrintf ("godmode OFF\n"); else SV_ClientPrintf ("godmode ON\n"); @@ -141,11 +136,17 @@ void Host_Notarget_f (void) return; } - if (pr_global_struct->deathmatch) + if (!sv_player) return; - sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET; - if (!((int)sv_player->v.flags & FL_NOTARGET) ) + if (!allowcheats) + { + SV_ClientPrintf("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) ) SV_ClientPrintf ("notarget OFF\n"); else SV_ClientPrintf ("notarget ON\n"); @@ -161,19 +162,25 @@ void Host_Noclip_f (void) return; } - if (pr_global_struct->deathmatch) + if (!sv_player) return; - if (sv_player->v.movetype != MOVETYPE_NOCLIP) + if (!allowcheats) + { + SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); + return; + } + + if (sv_player->v->movetype != MOVETYPE_NOCLIP) { noclip_anglehack = true; - sv_player->v.movetype = MOVETYPE_NOCLIP; + sv_player->v->movetype = MOVETYPE_NOCLIP; SV_ClientPrintf ("noclip ON\n"); } else { noclip_anglehack = false; - sv_player->v.movetype = MOVETYPE_WALK; + sv_player->v->movetype = MOVETYPE_WALK; SV_ClientPrintf ("noclip OFF\n"); } } @@ -193,17 +200,23 @@ void Host_Fly_f (void) return; } - if (pr_global_struct->deathmatch) + if (!sv_player) return; - if (sv_player->v.movetype != MOVETYPE_FLY) + if (!allowcheats) + { + SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); + return; + } + + if (sv_player->v->movetype != MOVETYPE_FLY) { - sv_player->v.movetype = MOVETYPE_FLY; + sv_player->v->movetype = MOVETYPE_FLY; SV_ClientPrintf ("flymode ON\n"); } else { - sv_player->v.movetype = MOVETYPE_WALK; + sv_player->v->movetype = MOVETYPE_WALK; SV_ClientPrintf ("flymode OFF\n"); } } @@ -220,7 +233,7 @@ void Host_Ping_f (void) int i, j; float total; client_t *client; - + if (cmd_source == src_command) { Cmd_ForwardToServer (); @@ -228,7 +241,7 @@ void Host_Ping_f (void) } SV_ClientPrintf ("Client ping times:\n"); - for (i=0, client = svs.clients ; iactive) continue; @@ -248,59 +261,33 @@ SERVER TRANSITIONS =============================================================================== */ - /* ====================== Host_Map_f -handle a +handle a map command from the console. Active clients are kicked off. ====================== */ void Host_Map_f (void) { - int i; - char name[MAX_QPATH]; - if (cmd_source != src_command) return; cls.demonum = -1; // stop demo loop in case this fails -// SCR_BeginLoadingPlaque (); - CL_Disconnect (); - Host_ShutdownServer(false); + Host_ShutdownServer(false); key_dest = key_game; // remove console or menu + SCR_BeginLoadingPlaque (); - cls.mapstring[0] = 0; - for (i=0 ; i : continue game on a new level\n"); @@ -325,8 +310,9 @@ void Host_Changelevel_f (void) return; } SV_SaveSpawnparms (); - strcpy (level, Cmd_Argv(1)); - SV_SpawnServer (level); + strcpy (sv_spawnmap, Cmd_Argv(1)); + if (host_initialized) + Host_PerformSpawnServerAndLoadGame(); } /* @@ -338,16 +324,14 @@ Restarts the current server for a dead player */ void Host_Restart_f (void) { - char mapname[MAX_QPATH]; - if (cls.demoplayback || !sv.active) return; if (cmd_source != src_command) return; - strcpy (mapname, sv.name); // must copy out, because it gets cleared - // in sv_spawnserver - SV_SpawnServer (mapname); + strcpy (sv_spawnmap, sv.name); + if (host_initialized) + Host_PerformSpawnServerAndLoadGame(); } /* @@ -360,7 +344,7 @@ This is sent just before a server changes levels */ void Host_Reconnect_f (void) { -// SCR_BeginLoadingPlaque (); + SCR_BeginLoadingPlaque(); cls.signon = 0; // need new connection messages } @@ -373,17 +357,7 @@ User command to connect to server */ void Host_Connect_f (void) { - char name[MAX_QPATH]; - - cls.demonum = -1; // stop demo loop in case this fails - if (cls.demoplayback) - { - CL_StopPlayback (); - CL_Disconnect (); - } - strcpy (name, Cmd_Argv(1)); - CL_EstablishConnection (name); - Host_Reconnect_f (); + CL_EstablishConnection(Cmd_Argv(1)); } @@ -401,7 +375,7 @@ LOAD / SAVE GAME =============== Host_SavegameComment -Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current +Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current =============== */ void Host_SavegameComment (char *text) @@ -430,14 +404,14 @@ Host_Savegame_f void Host_Savegame_f (void) { char name[256]; - FILE *f; + qfile_t *f; int i; char comment[SAVEGAME_COMMENT_LENGTH+1]; if (cmd_source != src_command) return; - if (!sv.active) + if (cls.state != ca_connected || !sv.active) { Con_Printf ("Not playing a local game.\n"); return; @@ -449,10 +423,21 @@ void Host_Savegame_f (void) return; } - if (svs.maxclients != 1) + for (i = 0;i < svs.maxclients;i++) { - Con_Printf ("Can't save multiplayer games.\n"); - return; + if (svs.clients[i].active) + { + if (i > 0) + { + Con_Printf("Can't save multiplayer games.\n"); + return; + } + if (svs.clients[i].edict->v->deadflag) + { + Con_Printf("Can't savegame with a dead player\n"); + return; + } + } } if (Cmd_Argc() != 2) @@ -466,44 +451,35 @@ void Host_Savegame_f (void) Con_Printf ("Relative pathnames are not allowed.\n"); return; } - - for (i=0 ; iv.health <= 0) ) - { - Con_Printf ("Can't savegame with a dead player\n"); - return; - } - } - sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1)); - COM_DefaultExtension (name, ".sav"); - + strlcpy (name, Cmd_Argv(1), sizeof (name)); + FS_DefaultExtension (name, ".sav", sizeof (name)); + Con_Printf ("Saving game to %s...\n", name); - f = fopen (name, "w"); + f = FS_Open (name, "w", false); if (!f) { Con_Printf ("ERROR: couldn't open.\n"); return; } - - fprintf (f, "%i\n", SAVEGAME_VERSION); + + FS_Printf (f, "%i\n", SAVEGAME_VERSION); Host_SavegameComment (comment); - fprintf (f, "%s\n", comment); + FS_Printf (f, "%s\n", comment); for (i=0 ; ispawn_parms[i]); - fprintf (f, "%d\n", current_skill); - fprintf (f, "%s\n", sv.name); - fprintf (f, "%f\n",sv.time); + FS_Printf (f, "%f\n", svs.clients[0].spawn_parms[i]); + FS_Printf (f, "%d\n", current_skill); + FS_Printf (f, "%s\n", sv.name); + FS_Printf (f, "%f\n",sv.time); // write the light styles 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->free = false; + memset (ent->v, 0, progs->entityfields * 4); + ent->e->free = false; ED_ParseEdict (start, ent); - - // link it into the bsp tree - if (!ent->free) + + // link it into the bsp tree + if (!ent->e->free) SV_LinkEdict (ent, false); } entnum++; } - + sv.num_edicts = entnum; sv.time = time; - fclose (f); + FS_Close (f); - for (i=0 ; ispawn_parms[i] = spawn_parms[i]; + for (i = 0;i < NUM_SPAWN_PARMS;i++) + svs.clients[0].spawn_parms[i] = spawn_parms[i]; - if (cls.state != ca_dedicated) - { - CL_EstablishConnection ("local"); - Host_Reconnect_f (); - } + // 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"); } //============================================================================ @@ -669,20 +662,21 @@ void Host_Loadgame_f (void) Host_Name_f ====================== */ +cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"}; void Host_Name_f (void) { - char *newName; + char newName[sizeof(host_client->name)]; if (Cmd_Argc () == 1) { Con_Printf ("\"name\" is \"%s\"\n", cl_name.string); return; } + if (Cmd_Argc () == 2) - newName = Cmd_Argv(1); + strlcpy (newName, Cmd_Argv(1), sizeof (newName)); else - newName = Cmd_Args(); - newName[15] = 0; + strlcpy (newName, Cmd_Args(), sizeof (newName)); if (cmd_source == src_command) { @@ -694,35 +688,35 @@ void Host_Name_f (void) return; } - if (host_client->name[0] && strcmp(host_client->name, "unconnected") ) - if (strcmp(host_client->name, newName) != 0) - Con_Printf ("%s renamed to %s\n", host_client->name, newName); - strcpy (host_client->name, newName); - host_client->edict->v.netname = host_client->name - pr_strings; - + if (strcmp(host_client->name, newName) && host_client->name[0] && strcmp(host_client->name, "unconnected")) + SV_BroadcastPrintf("%s changed name to %s\n", host_client->name, newName); + strcpy(host_client->name, newName); + strcpy(host_client->old_name, newName); + if (sv_player) + sv_player->v->netname = PR_SetString(host_client->name); + //Con_Printf("Host_Name_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); + // send notification to all clients - - MSG_WriteByte (&sv.reliable_datagram, svc_updatename); - MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients); - MSG_WriteString (&sv.reliable_datagram, host_client->name); + + MSG_WriteByte(&sv.reliable_datagram, svc_updatename); + MSG_WriteByte(&sv.reliable_datagram, host_client->number); + MSG_WriteString(&sv.reliable_datagram, host_client->name); } - + void Host_Version_f (void) { - Con_Printf ("Version %4.2f (build %i)\n", VERSION, buildnumber); - Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); + Con_Printf ("Version: %s build %s\n", gamename, buildstring); } void Host_Say(qboolean teamonly) { - client_t *client; client_t *save; - int j; - char *p; + int j; + const char *p1, *p2; // LordHavoc: 256 char say messages - unsigned char text[256]; - qboolean fromServer = false; + unsigned char text[256]; + qboolean fromServer = false; if (cmd_source == src_command) { @@ -743,36 +737,38 @@ void Host_Say(qboolean teamonly) save = host_client; - p = Cmd_Args(); -// remove quotes if present - if (*p == '"') - { - p++; - p[strlen(p)-1] = 0; - } - // turn on color set 1 if (!fromServer) - sprintf (text, "%c%s: ", 1, save->name); + sprintf (text, "%c%s: ", 1, host_client->name); else sprintf (text, "%c<%s> ", 1, hostname.string); - j = sizeof(text) - 2 - strlen(text); // -2 for /n and null terminator - if (strlen(p) > j) - p[j] = 0; - - strcat (text, p); - strcat (text, "\n"); - - for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++) - { - if (!client || !client->active || !client->spawned) - continue; - if (teamplay.value && teamonly && client->edict->v.team != save->edict->v.team) - continue; - host_client = client; - SV_ClientPrintf("%s", text); - } + p1 = Cmd_Args(); + p2 = p1 + strlen(p1); + // remove trailing newlines + while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) + p2--; + // remove quotes if present + if (*p1 == '"') + { + p1++; + if (p2[-1] == '"') + p2--; + else if (fromServer) + Con_Printf("Host_Say: missing end quote\n"); + else + SV_ClientPrintf("Host_Say: missing end quote\n"); + } + while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) + p2--; + for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;) + text[j++] = *p1++; + text[j++] = '\n'; + text[j++] = 0; + + for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++) + if (host_client->spawned && (!teamplay.integer || host_client->edict->v->team == save->edict->v->team)) + SV_ClientPrintf("%s", text); host_client = save; Sys_Printf("%s", &text[1]); @@ -793,52 +789,63 @@ void Host_Say_Team_f(void) void Host_Tell_f(void) { - client_t *client; client_t *save; - int j; - char *p; - char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64) + int j; + const char *p1, *p2; + char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64) + qboolean fromServer = false; if (cmd_source == src_command) { - Cmd_ForwardToServer (); - return; + if (cls.state == ca_dedicated) + fromServer = true; + else + { + Cmd_ForwardToServer (); + return; + } } if (Cmd_Argc () < 3) return; - strcpy(text, host_client->name); - strcat(text, ": "); - - p = Cmd_Args(); - -// remove quotes if present - if (*p == '"') - { - p++; - p[strlen(p)-1] = 0; + if (!fromServer) + sprintf (text, "%s: ", host_client->name); + else + sprintf (text, "<%s> ", hostname.string); + + p1 = Cmd_Args(); + p2 = p1 + strlen(p1); + // remove the target name + while (p1 < p2 && *p1 != ' ') + p1++; + while (p1 < p2 && *p1 == ' ') + p1++; + // remove trailing newlines + while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) + p2--; + // remove quotes if present + if (*p1 == '"') + { + p1++; + if (p2[-1] == '"') + p2--; + else if (fromServer) + Con_Printf("Host_Tell: missing end quote\n"); + else + SV_ClientPrintf("Host_Tell: missing end quote\n"); } - -// check length & truncate if necessary - j = sizeof(text) - 2 - strlen(text); // -2 for /n and null terminator - if (strlen(p) > j) - p[j] = 0; - - strcat (text, p); - strcat (text, "\n"); + while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) + p2--; + for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;) + text[j++] = *p1++; + text[j++] = '\n'; + text[j++] = 0; save = host_client; - for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++) - { - if (!client->active || !client->spawned) - continue; - if (Q_strcasecmp(client->name, Cmd_Argv(1))) - continue; - host_client = client; - SV_ClientPrintf("%s", text); - break; - } + 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_ClientPrintf("%s", text); host_client = save; } @@ -848,17 +855,18 @@ void Host_Tell_f(void) Host_Color_f ================== */ +cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0"}; void Host_Color_f(void) { int top, bottom; int playercolor; - dfunction_t *f; + mfunction_t *f; func_t SV_ChangeTeam; - + if (Cmd_Argc() == 1) { - Con_Printf ("\"color\" is \"%i %i\"\n", ((int)cl_color.value) >> 4, ((int)cl_color.value) & 0x0f); - Con_Printf ("color <0-13> [0-13]\n"); + Con_Printf ("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15); + Con_Printf ("color <0-15> [0-15]\n"); return; } @@ -869,7 +877,7 @@ void Host_Color_f(void) top = atoi(Cmd_Argv(1)); bottom = atoi(Cmd_Argv(2)); } - + top &= 15; // LordHavoc: allow skin colormaps 14 and 15 (was 13) if (top > 15) @@ -878,7 +886,7 @@ void Host_Color_f(void) // LordHavoc: allow skin colormaps 14 and 15 (was 13) if (bottom > 15) bottom = 15; - + playercolor = top*16 + bottom; if (cmd_source == src_command) @@ -889,23 +897,29 @@ void Host_Color_f(void) return; } - // void(float color) SV_ChangeTeam; - if ((f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions))) + if (sv_player && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions))) { Con_DPrintf("Calling SV_ChangeTeam\n"); pr_global_struct->time = sv.time; - pr_globals[0] = playercolor; - pr_global_struct->self = EDICT_TO_PROG(host_client->edict); + pr_globals[OFS_PARM0] = playercolor; + pr_global_struct->self = EDICT_TO_PROG(sv_player); PR_ExecuteProgram (SV_ChangeTeam, ""); } else { + eval_t *val; + if (sv_player) + { + if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors))) + val->_float = playercolor; + sv_player->v->team = bottom + 1; + } host_client->colors = playercolor; - host_client->edict->v.team = bottom + 1; + host_client->old_colors = playercolor; // send notification to all clients MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); - MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients); + MSG_WriteByte (&sv.reliable_datagram, host_client->number); MSG_WriteByte (&sv.reliable_datagram, host_client->colors); } } @@ -923,14 +937,14 @@ void Host_Kill_f (void) return; } - if (sv_player->v.health <= 0) + if (!sv_player || sv_player->v->health <= 0) { SV_ClientPrintf ("Can't suicide -- already dead!\n"); return; } - + pr_global_struct->time = sv.time; - pr_global_struct->self = EDICT_TO_PROG(sv_player); + pr_global_struct->self = EDICT_TO_PROG(host_client->edict); PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing"); } @@ -942,33 +956,58 @@ Host_Pause_f */ void Host_Pause_f (void) { - + if (cmd_source == src_command) { Cmd_ForwardToServer (); return; } - if (!pausable.value) + if (!pausable.integer) SV_ClientPrintf ("Pause not allowed.\n"); else { sv.paused ^= 1; - - if (sv.paused) - { - SV_BroadcastPrintf ("%s paused the game\n", pr_strings + sv_player->v.netname); - } - else - { - SV_BroadcastPrintf ("%s unpaused the game\n",pr_strings + sv_player->v.netname); - } - - // send notification to all clients + SV_BroadcastPrintf ("%s %spaused the game\n", host_client->name, sv.paused ? "" : "un"); + // send notification to all clients MSG_WriteByte (&sv.reliable_datagram, svc_setpause); MSG_WriteByte (&sv.reliable_datagram, sv.paused); } } +/* +====================== +Host_PModel_f +LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen. +====================== +*/ +cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"}; +static void Host_PModel_f (void) +{ + int i; + eval_t *val; + + if (Cmd_Argc () == 1) + { + Con_Printf ("\"pmodel\" is \"%s\"\n", cl_pmodel.string); + return; + } + i = atoi(Cmd_Argv(1)); + + if (cmd_source == src_command) + { + if (cl_pmodel.integer == i) + return; + Cvar_SetValue ("_cl_pmodel", i); + if (cls.state == ca_connected) + Cmd_ForwardToServer (); + return; + } + + host_client->pmodel = i; + if (sv_player && (val = GETEDICTFIELDVALUE(sv_player, eval_pmodel))) + val->_float = i; +} + //=========================================================================== @@ -990,7 +1029,7 @@ void Host_PreSpawn_f (void) Con_Printf ("prespawn not valid -- already spawned\n"); 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); @@ -1004,31 +1043,37 @@ Host_Spawn_f */ void Host_Spawn_f (void) { - int i; - client_t *client; - edict_t *ent; + int i; + client_t *client; func_t RestoreGame; - dfunction_t *f; + mfunction_t *f; if (cmd_source == src_command) { - Con_Printf ("spawn is not valid from the console\n"); + Con_Printf("spawn is not valid from the console\n"); return; } if (host_client->spawned) { - Con_Printf ("Spawn not valid -- already spawned\n"); + Con_Printf("Spawn not valid -- already spawned\n"); + return; + } + + if (!sv_player) + { + Con_Printf("Host_Spawn: no edict??\n"); return; } // LordHavoc: moved this above the QC calls at FrikaC's request -// send all current names, colors, and frag counts + // send all current names, colors, and frag counts SZ_Clear (&host_client->message); -// run the entrance script + // run the entrance script if (sv.loadgame) - { // loaded games are fully inited already + { + // loaded games are fully initialized already // if this is the last client to be connected, unpause sv.paused = false; @@ -1043,53 +1088,47 @@ void Host_Spawn_f (void) } else { - eval_t *val; // set up the edict - ent = host_client->edict; + ED_ClearEdict(sv_player); - memset (&ent->v, 0, progs->entityfields * 4); - ent->v.colormap = NUM_FOR_EDICT(ent); - ent->v.team = (host_client->colors & 15) + 1; - ent->v.netname = host_client->name - pr_strings; - if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel))) - val->_float = host_client->pmodel; + //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); // 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]; // 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"); - if ((Sys_FloatTime() - host_client->netconnection->connecttime) <= sv.time) + if ((Sys_DoubleTime() - host_client->netconnection->connecttime) <= sv.time) Sys_Printf ("%s entered the game\n", host_client->name); PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing"); } -// send time of update + // send time of update MSG_WriteByte (&host_client->message, svc_time); MSG_WriteFloat (&host_client->message, sv.time); - for (i=0, client = svs.clients ; iactive) + continue; MSG_WriteByte (&host_client->message, svc_updatename); MSG_WriteByte (&host_client->message, i); - MSG_WriteString (&host_client->message, client->name); + MSG_WriteString (&host_client->message, client->old_name); MSG_WriteByte (&host_client->message, svc_updatefrags); MSG_WriteByte (&host_client->message, i); MSG_WriteShort (&host_client->message, client->old_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->message, client->old_colors); } - -// send all current light styles + + // send all current light styles for (i=0 ; imessage, svc_lightstyle); @@ -1097,9 +1136,7 @@ void Host_Spawn_f (void) MSG_WriteString (&host_client->message, sv.lightstyles[i]); } -// -// send some stats -// + // 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); @@ -1116,16 +1153,14 @@ void Host_Spawn_f (void) MSG_WriteByte (&host_client->message, STAT_MONSTERS); MSG_WriteLong (&host_client->message, pr_global_struct->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 - ent = EDICT_NUM( 1 + (host_client - svs.clients) ); + // 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); for (i=0 ; i < 2 ; i++) - MSG_WriteAngle (&host_client->message, ent->v.angles[i] ); + MSG_WriteAngle (&host_client->message, sv_player->v->angles[i] ); MSG_WriteAngle (&host_client->message, 0 ); SV_WriteClientdataToMessage (sv_player, &host_client->message); @@ -1163,21 +1198,13 @@ Kicks a user off of the server */ void Host_Kick_f (void) { - char *who; - char *message = NULL; - client_t *save; - int i; - qboolean byNumber = false; + char *who; + const char *message = NULL; + client_t *save; + int i; + qboolean byNumber = false; - if (cmd_source == src_command) - { - if (!sv.active) - { - Cmd_ForwardToServer (); - return; - } - } - else if (pr_global_struct->deathmatch) + if (cmd_source != src_command || !sv.active) return; save = host_client; @@ -1185,20 +1212,17 @@ void Host_Kick_f (void) if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0) { i = atof(Cmd_Argv(2)) - 1; - if (i < 0 || i >= svs.maxclients) + if (i < 0 || i >= svs.maxclients || !(host_client = svs.clients + i)->active) return; - if (!svs.clients[i].active) - return; - host_client = &svs.clients[i]; byNumber = true; } else { - for (i = 0, host_client = svs.clients; i < svs.maxclients; i++, host_client++) + for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { if (!host_client->active) continue; - if (Q_strcasecmp(host_client->name, Cmd_Argv(1)) == 0) + if (strcasecmp(host_client->name, Cmd_Argv(1)) == 0) break; } } @@ -1206,10 +1230,12 @@ void Host_Kick_f (void) if (i < svs.maxclients) { if (cmd_source == src_command) + { if (cls.state == ca_dedicated) who = "Console"; else who = cl_name.string; + } else who = save->name; @@ -1219,7 +1245,8 @@ void Host_Kick_f (void) if (Cmd_Argc() > 2) { - message = COM_Parse(Cmd_Args()); + message = Cmd_Args(); + COM_ParseToken(&message, false); if (byNumber) { message++; // skip the # @@ -1234,7 +1261,7 @@ void Host_Kick_f (void) SV_ClientPrintf ("Kicked by %s: %s\n", who, message); else SV_ClientPrintf ("Kicked by %s\n", who); - SV_DropClient (false); + SV_DropClient (false); // kicked } host_client = save; @@ -1255,9 +1282,9 @@ Host_Give_f */ void Host_Give_f (void) { - char *t; - int v; - eval_t *val; + const char *t; + int v; + eval_t *val; if (cmd_source == src_command) { @@ -1265,155 +1292,158 @@ void Host_Give_f (void) return; } - if (pr_global_struct->deathmatch) + if (!sv_player) + return; + + if (!allowcheats) + { + SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); return; + } t = Cmd_Argv(1); v = atoi (Cmd_Argv(2)); - + switch (t[0]) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - // MED 01/04/97 added hipnotic give stuff - if (hipnotic) - { - if (t[0] == '6') - { - if (t[1] == 'a') - sv_player->v.items = (int)sv_player->v.items | HIT_PROXIMITY_GUN; - else - sv_player->v.items = (int)sv_player->v.items | IT_GRENADE_LAUNCHER; - } - else if (t[0] == '9') - sv_player->v.items = (int)sv_player->v.items | HIT_LASER_CANNON; - else if (t[0] == '0') - sv_player->v.items = (int)sv_player->v.items | HIT_MJOLNIR; - else if (t[0] >= '2') - sv_player->v.items = (int)sv_player->v.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')); - } - break; - - case 's': - if (rogue) + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + // MED 01/04/97 added hipnotic give stuff + if (gamemode == GAME_HIPNOTIC) + { + if (t[0] == '6') + { + if (t[1] == 'a') + sv_player->v->items = (int)sv_player->v->items | HIT_PROXIMITY_GUN; + else + sv_player->v->items = (int)sv_player->v->items | IT_GRENADE_LAUNCHER; + } + else if (t[0] == '9') + sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON; + else if (t[0] == '0') + sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR; + else if (t[0] >= '2') + sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2')); + } + else { - if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))) - val->_float = v; + if (t[0] >= '2') + sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2')); } + break; + + case 's': + if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))) + val->_float = v; - sv_player->v.ammo_shells = v; - break; - case 'n': - if (rogue) + sv_player->v->ammo_shells = v; + break; + case 'n': + if (gamemode == GAME_ROGUE) { - if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1))) + if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1))) { - val->_float = v; - if (sv_player->v.weapon <= IT_LIGHTNING) - sv_player->v.ammo_nails = v; + val->_float = v; + if (sv_player->v->weapon <= IT_LIGHTNING) + sv_player->v->ammo_nails = v; } } else { - sv_player->v.ammo_nails = v; + sv_player->v->ammo_nails = v; } - break; - case 'l': - if (rogue) + break; + case 'l': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_lava_nails); if (val) { val->_float = v; - if (sv_player->v.weapon > IT_LIGHTNING) - sv_player->v.ammo_nails = v; + if (sv_player->v->weapon > IT_LIGHTNING) + sv_player->v->ammo_nails = v; } } - break; - case 'r': - if (rogue) + break; + case 'r': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_rockets1); if (val) { val->_float = v; - if (sv_player->v.weapon <= IT_LIGHTNING) - sv_player->v.ammo_rockets = v; + if (sv_player->v->weapon <= IT_LIGHTNING) + sv_player->v->ammo_rockets = v; } } else { - sv_player->v.ammo_rockets = v; + sv_player->v->ammo_rockets = v; } - break; - case 'm': - if (rogue) + break; + case 'm': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_multi_rockets); if (val) { val->_float = v; - if (sv_player->v.weapon > IT_LIGHTNING) - sv_player->v.ammo_rockets = v; + if (sv_player->v->weapon > IT_LIGHTNING) + sv_player->v->ammo_rockets = v; } } - break; - case 'h': - sv_player->v.health = v; - break; - case 'c': - if (rogue) + break; + case 'h': + sv_player->v->health = v; + break; + case 'c': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_cells1); if (val) { val->_float = v; - if (sv_player->v.weapon <= IT_LIGHTNING) - sv_player->v.ammo_cells = v; + if (sv_player->v->weapon <= IT_LIGHTNING) + sv_player->v->ammo_cells = v; } } else { - sv_player->v.ammo_cells = v; + sv_player->v->ammo_cells = v; } - break; - case 'p': - if (rogue) + break; + case 'p': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_plasma); if (val) { val->_float = v; - if (sv_player->v.weapon > IT_LIGHTNING) - sv_player->v.ammo_cells = v; + if (sv_player->v->weapon > IT_LIGHTNING) + sv_player->v->ammo_cells = v; } } - break; - } + break; + } } edict_t *FindViewthing (void) { int i; edict_t *e; - + for (i=0 ; iv.classname, "viewthing") ) + if (!strcmp (PR_GetString(e->v->classname), "viewthing")) return e; } Con_Printf ("No viewthing on map\n"); @@ -1434,15 +1464,15 @@ void Host_Viewmodel_f (void) if (!e) return; - m = Mod_ForName (Cmd_Argv(1), false); + m = Mod_ForName (Cmd_Argv(1), false, true, false); if (!m) { Con_Printf ("Can't load %s\n", Cmd_Argv(1)); return; } - - e->v.frame = 0; - cl.model_precache[(int)e->v.modelindex] = m; + + e->v->frame = 0; + cl.model_precache[(int)e->v->modelindex] = m; } /* @@ -1459,22 +1489,20 @@ void Host_Viewframe_f (void) e = FindViewthing (); if (!e) return; - m = cl.model_precache[(int)e->v.modelindex]; + m = cl.model_precache[(int)e->v->modelindex]; f = atoi(Cmd_Argv(1)); if (f >= m->numframes) f = m->numframes-1; - e->v.frame = f; + e->v->frame = f; } void PrintFrameName (model_t *m, int frame) { - int data; - data = (int) Mod_Extradata(m); - if (m->ofs_scenes && data) - Con_Printf("frame %i: %s\n", frame, ((animscene_t *) (m->ofs_scenes + data))[frame].name); + if (m->animscenes) + Con_Printf("frame %i: %s\n", frame, m->animscenes[frame].name); else Con_Printf("frame %i\n", frame); } @@ -1488,17 +1516,17 @@ void Host_Viewnext_f (void) { edict_t *e; model_t *m; - + e = FindViewthing (); if (!e) return; - m = cl.model_precache[(int)e->v.modelindex]; + m = cl.model_precache[(int)e->v->modelindex]; - e->v.frame = e->v.frame + 1; - if (e->v.frame >= m->numframes) - e->v.frame = m->numframes - 1; + e->v->frame = e->v->frame + 1; + if (e->v->frame >= m->numframes) + e->v->frame = m->numframes - 1; - PrintFrameName (m, e->v.frame); + PrintFrameName (m, e->v->frame); } /* @@ -1515,13 +1543,13 @@ void Host_Viewprev_f (void) if (!e) return; - m = cl.model_precache[(int)e->v.modelindex]; + m = cl.model_precache[(int)e->v->modelindex]; - e->v.frame = e->v.frame - 1; - if (e->v.frame < 0) - e->v.frame = 0; + e->v->frame = e->v->frame - 1; + if (e->v->frame < 0) + e->v->frame = 0; - PrintFrameName (m, e->v.frame); + PrintFrameName (m, e->v->frame); } /* @@ -1542,10 +1570,15 @@ void Host_Startdemos_f (void) { int i, c; - if (cls.state == ca_dedicated) + if (cls.state == ca_dedicated || COM_CheckParm("-listen")) { - if (!sv.active) - Cbuf_AddText ("map start\n"); + if (!sv.active && !sv_spawnmap[0]) + { + if (gamemode == GAME_TRANSFUSION) + Cbuf_AddText ("map bb1\n"); + else + Cbuf_AddText ("map start\n"); + } return; } @@ -1555,10 +1588,14 @@ void Host_Startdemos_f (void) Con_Printf ("Max %i demos in demoloop\n", MAX_DEMOS); c = MAX_DEMOS; } - Con_Printf ("%i demo(s) in loop\n", c); + Con_DPrintf ("%i demo(s) in loop\n", c); for (i=1 ; i