X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=43633d823e590e7687b348db4463f55a45547a47;hb=d3b158411b1d81181e05f750d9a7b0b2268438e2;hp=1aca802bfb70d287e68cf5d86c47037644ae960e;hpb=3b559840aaf1e5a218052d893881c1dd8c1b0780;p=xonotic%2Fdarkplaces.git diff --git a/host_cmd.c b/host_cmd.c index 1aca802b..43633d82 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -51,7 +51,7 @@ Host_Status_f void Host_Status_f (void) { client_t *client; - int seconds, minutes, hours = 0, j; + int seconds, minutes, hours = 0, j, players; void (*print) (const char *fmt, ...); if (cmd_source == src_command) @@ -66,19 +66,18 @@ void Host_Status_f (void) else print = SV_ClientPrintf; + for (players = 0, j = 0;j < MAX_SCOREBOARD;j++) + if (svs.connectedclients[j]) + players++; print ("host: %s\n", Cvar_VariableString ("hostname")); print ("version: %s build %s\n", gamename, buildstring); - if (tcpipAvailable) - print ("tcp/ip: %s\n", my_tcpip_address); - if (ipxAvailable) - print ("ipx: %s\n", my_ipx_address); 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) + if (!(client = svs.connectedclients[j])) continue; - seconds = (int)(net_time - client->netconnection->connecttime); + seconds = (int)(realtime - client->netconnection->connecttime); minutes = seconds / 60; if (minutes) { @@ -89,7 +88,7 @@ void Host_Status_f (void) } else hours = 0; - print ("#%-2u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)EDICT_NUM(client->edictnumber)->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); } } @@ -110,7 +109,7 @@ void Host_God_f (void) return; } - if (pr_global_struct->deathmatch) + if (pr_global_struct->deathmatch || !sv_player) return; sv_player->v->flags = (int)sv_player->v->flags ^ FL_GODMODE; @@ -128,7 +127,7 @@ void Host_Notarget_f (void) return; } - if (pr_global_struct->deathmatch) + if (pr_global_struct->deathmatch || !sv_player) return; sv_player->v->flags = (int)sv_player->v->flags ^ FL_NOTARGET; @@ -148,7 +147,7 @@ void Host_Noclip_f (void) return; } - if (pr_global_struct->deathmatch) + if (pr_global_struct->deathmatch || !sv_player) return; if (sv_player->v->movetype != MOVETYPE_NOCLIP) @@ -180,7 +179,7 @@ void Host_Fly_f (void) return; } - if (pr_global_struct->deathmatch) + if (pr_global_struct->deathmatch || !sv_player) return; if (sv_player->v->movetype != MOVETYPE_FLY) @@ -215,9 +214,9 @@ void Host_Ping_f (void) } SV_ClientPrintf ("Client ping times:\n"); - for (i=0, client = svs.clients ; iactive) + if (!(client = svs.connectedclients[i])) continue; total = 0; for (j=0 ; j 0) + { + Con_Printf("Can't save multiplayer games.\n"); + return; + } + if (svs.connectedclients[i]->edict->v->deadflag) + { + Con_Printf("Can't savegame with a dead player\n"); + return; + } + } } if (Cmd_Argc() != 2) @@ -416,15 +419,6 @@ void Host_Savegame_f (void) return; } - for (i=0 ; iv->health <= 0) ) - { - Con_Printf ("Can't savegame with a dead player\n"); - return; - } - } - strncpy (name, Cmd_Argv(1), sizeof (name) - 1); name[sizeof (name) - 1] = '\0'; FS_DefaultExtension (name, ".sav"); @@ -441,7 +435,7 @@ void Host_Savegame_f (void) Host_SavegameComment (comment); FS_Printf (f, "%s\n", comment); for (i=0 ; ispawn_parms[i]); + FS_Printf (f, "%f\n", svs.connectedclients[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); @@ -543,8 +537,6 @@ void Host_PerformLoadGame(char *name) str = FS_Getline (f); sscanf (str, "%f\n",&time); - CL_Disconnect_f (); - SV_SpawnServer (mapname); if (!sv.active) { @@ -584,7 +576,7 @@ void Host_PerformLoadGame(char *name) Host_Error ("Loadgame buffer overflow"); buf[i] = 0; start = buf; - if (!COM_ParseToken(&start)) + if (!COM_ParseToken(&start, false)) { // end of file break; @@ -600,13 +592,17 @@ void Host_PerformLoadGame(char *name) else { // parse an edict + if (entnum >= 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; + ent->e->free = false; ED_ParseEdict (start, ent); // link it into the bsp tree - if (!ent->free) + if (!ent->e->free) SV_LinkEdict (ent, false); } @@ -619,13 +615,11 @@ void Host_PerformLoadGame(char *name) FS_Close (f); for (i = 0;i < NUM_SPAWN_PARMS;i++) - svs.clients->spawn_parms[i] = spawn_parms[i]; + svs.connectedclients[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"); } //============================================================================ @@ -635,9 +629,10 @@ void Host_PerformLoadGame(char *name) Host_Name_f ====================== */ +cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"}; void Host_Name_f (void) { - char newName[64]; + char newName[sizeof(host_client->name)]; if (Cmd_Argc () == 1) { @@ -646,10 +641,10 @@ void Host_Name_f (void) } if (Cmd_Argc () == 2) - strncpy(newName, Cmd_Argv(1), 15); + strncpy(newName, Cmd_Argv(1), sizeof(host_client->name) - 1); else - strncpy(newName, Cmd_Args(), 15); - newName[15] = 0; + strncpy(newName, Cmd_Args(), sizeof(host_client->name) - 1); + newName[sizeof(host_client->name) - 1] = 0; if (cmd_source == src_command) { @@ -661,17 +656,19 @@ 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); - EDICT_NUM(host_client->edictnumber)->v->netname = PR_SetString(host_client->name); + 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); } @@ -682,7 +679,6 @@ void Host_Version_f (void) void Host_Say(qboolean teamonly) { - client_t *client; client_t *save; int j; const char *p1, *p2; @@ -707,14 +703,14 @@ void Host_Say(qboolean teamonly) if (Cmd_Argc () < 2) return; + save = host_client; + // turn on color set 1 if (!fromServer) sprintf (text, "%c%s: ", 1, host_client->name); else sprintf (text, "%c<%s> ", 1, hostname.string); - save = host_client; - p1 = Cmd_Args(); p2 = p1 + strlen(p1); // remove trailing newlines @@ -726,8 +722,10 @@ void Host_Say(qboolean teamonly) p1++; if (p2[-1] == '"') p2--; - else + 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--; @@ -736,15 +734,9 @@ void Host_Say(qboolean teamonly) text[j++] = '\n'; text[j++] = 0; - for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++) - { - if (!client || !client->active || !client->spawned) - continue; - if (teamplay.integer && teamonly && EDICT_NUM(client->edictnumber)->v->team != EDICT_NUM(save->edictnumber)->v->team) - continue; - host_client = client; - SV_ClientPrintf("%s", text); - } + for (j = 0;j < MAX_SCOREBOARD;j++) + if ((host_client = svs.connectedclients[j]) && 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]); @@ -765,7 +757,6 @@ void Host_Say_Team_f(void) void Host_Tell_f(void) { - client_t *client; client_t *save; int j; const char *p1, *p2; @@ -807,8 +798,10 @@ void Host_Tell_f(void) p1++; if (p2[-1] == '"') p2--; + else if (fromServer) + Con_Printf("Host_Tell: missing end quote\n"); else - Con_Printf("Host_Say: missing end quote\n"); + SV_ClientPrintf("Host_Tell: missing end quote\n"); } while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) p2--; @@ -818,16 +811,9 @@ void Host_Tell_f(void) text[j++] = 0; save = host_client; - for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++) - { - if (!client->active || !client->spawned) - continue; - if (strcasecmp(client->name, Cmd_Argv(1))) - continue; - host_client = client; - SV_ClientPrintf("%s", text); - break; - } + for (j = 0;j < MAX_SCOREBOARD;j++) + if ((host_client = svs.connectedclients[j]) && host_client->spawned && !strcasecmp(host_client->name, Cmd_Argv(1))) + SV_ClientPrintf("%s", text); host_client = save; } @@ -837,6 +823,7 @@ 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; @@ -878,22 +865,29 @@ void Host_Color_f(void) return; } - 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[OFS_PARM0] = playercolor; - pr_global_struct->self = EDICT_TO_PROG(EDICT_NUM(host_client->edictnumber)); + 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; - EDICT_NUM(host_client->edictnumber)->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); } } @@ -911,14 +905,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"); } @@ -941,22 +935,47 @@ void Host_Pause_f (void) else { sv.paused ^= 1; - - if (sv.paused) - { - SV_BroadcastPrintf ("%s paused the game\n", PR_GetString(sv_player->v->netname)); - } - else - { - SV_BroadcastPrintf ("%s unpaused the game\n", PR_GetString(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; +} + //=========================================================================== @@ -992,29 +1011,34 @@ Host_Spawn_f */ void Host_Spawn_f (void) { - int i; - client_t *client; - edict_t *ent; + int i; + client_t *client; func_t RestoreGame; 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 initialized already @@ -1032,24 +1056,16 @@ void Host_Spawn_f (void) } else { - eval_t *val; // set up the edict - ent = EDICT_NUM(host_client->edictnumber); + 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 = PR_SetString(host_client->name); - if ((val = GETEDICTFIELDVALUE(ent, 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"); @@ -1061,24 +1077,26 @@ void Host_Spawn_f (void) } -// 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 ; imessage, 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); @@ -1086,9 +1104,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); @@ -1105,15 +1121,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); @@ -1173,25 +1188,22 @@ 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) - return; - if (!svs.clients[i].active) + if (i < 0 || i >= MAX_SCOREBOARD || !(host_client = svs.connectedclients[i])) 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;i < MAX_SCOREBOARD;i++) { - if (!host_client->active) + if (!(host_client = svs.connectedclients[i])) continue; if (strcasecmp(host_client->name, Cmd_Argv(1)) == 0) break; } } - if (i < svs.maxclients) + if (i < MAX_SCOREBOARD) { if (cmd_source == src_command) { @@ -1210,7 +1222,7 @@ void Host_Kick_f (void) if (Cmd_Argc() > 2) { message = Cmd_Args(); - COM_ParseToken(&message); + COM_ParseToken(&message, false); if (byNumber) { message++; // skip the # @@ -1256,7 +1268,7 @@ void Host_Give_f (void) return; } - if (pr_global_struct->deathmatch) + if (pr_global_struct->deathmatch || !sv_player) return; t = Cmd_Argv(1); @@ -1280,9 +1292,9 @@ 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; + 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; + 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; @@ -1299,11 +1311,8 @@ void Host_Give_f (void) break; case 's': - if (gamemode == GAME_ROGUE) - { - if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))) - val->_float = v; - } + if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))) + val->_float = v; sv_player->v->ammo_shells = v; break; @@ -1531,7 +1540,7 @@ void Host_Startdemos_f (void) { int i, c; - if (cls.state == ca_dedicated) + if (cls.state == ca_dedicated || COM_CheckParm("-listen")) { if (!sv.active && !sv_spawnmap[0]) { @@ -1549,11 +1558,15 @@ 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