X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=9e202d1e6ff840a780e57012759ad316183da140;hb=fdfa815d659f4ceec149ce3f907c107f38022c3d;hp=d4b1a659eb435a630038bf056e24da20b7c39746;hpb=b44563794a2f0644800fdf82f2a848888de6c10b;p=xonotic%2Fdarkplaces.git diff --git a/host_cmd.c b/host_cmd.c index d4b1a659..9e202d1e 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,9 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -int current_skill; +int current_skill; +char sv_spawnmap[MAX_QPATH]; +char sv_loadgame[MAX_OSPATH]; -dfunction_t *ED_FindFunction (char *name); +mfunction_t *ED_FindFunction (char *name); /* ================== @@ -48,12 +50,9 @@ 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) { @@ -67,19 +66,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: %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); + print ("players: %i active (%i max)\n\n", players, 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) { @@ -90,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)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); } } @@ -114,8 +112,8 @@ void Host_God_f (void) if (pr_global_struct->deathmatch) return; - sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE; - if (!((int)sv_player->v.flags & FL_GODMODE) ) + 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"); @@ -132,8 +130,8 @@ void Host_Notarget_f (void) if (pr_global_struct->deathmatch) return; - sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET; - if (!((int)sv_player->v.flags & FL_NOTARGET) ) + 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"); @@ -152,16 +150,16 @@ void Host_Noclip_f (void) if (pr_global_struct->deathmatch) return; - if (sv_player->v.movetype != MOVETYPE_NOCLIP) + 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"); } } @@ -184,14 +182,14 @@ void Host_Fly_f (void) if (pr_global_struct->deathmatch) return; - if (sv_player->v.movetype != MOVETYPE_FLY) + 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"); } } @@ -208,7 +206,7 @@ void Host_Ping_f (void) int i, j; float total; client_t *client; - + if (cmd_source == src_command) { Cmd_ForwardToServer (); @@ -236,7 +234,6 @@ SERVER TRANSITIONS =============================================================================== */ - /* ====================== Host_Map_f @@ -248,9 +245,6 @@ 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; @@ -263,33 +257,8 @@ void Host_Map_f (void) key_dest = key_game; // remove console or menu - cls.mapstring[0] = 0; - for (i=0 ; i : continue game on a new level\n"); @@ -314,8 +281,7 @@ void Host_Changelevel_f (void) return; } SV_SaveSpawnparms (); - strcpy (level, Cmd_Argv(1)); - SV_SpawnServer (level); + strcpy (sv_spawnmap, Cmd_Argv(1)); } /* @@ -327,16 +293,12 @@ 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); } /* @@ -349,7 +311,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 } @@ -362,14 +324,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_Disconnect (); - strcpy (name, Cmd_Argv(1)); - CL_EstablishConnection (name); - Host_Reconnect_f (); + CL_EstablishConnection(Cmd_Argv(1)); } @@ -416,7 +371,7 @@ Host_Savegame_f void Host_Savegame_f (void) { char name[256]; - QFile *f; + qfile_t *f; int i; char comment[SAVEGAME_COMMENT_LENGTH+1]; @@ -455,41 +410,42 @@ void Host_Savegame_f (void) for (i=0 ; iv.health <= 0) ) + if (svs.clients[i].active && (svs.clients[i].edict->v->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"); + strncpy (name, Cmd_Argv(1), sizeof (name) - 1); + name[sizeof (name) - 1] = '\0'; + FS_DefaultExtension (name, ".sav"); Con_Printf ("Saving game to %s...\n", name); - f = Qopen (name, "w"); + f = FS_Open (name, "w", false); if (!f) { Con_Printf ("ERROR: couldn't open.\n"); return; } - Qprintf (f, "%i\n", SAVEGAME_VERSION); + FS_Printf (f, "%i\n", SAVEGAME_VERSION); Host_SavegameComment (comment); - Qprintf (f, "%s\n", comment); + FS_Printf (f, "%s\n", comment); for (i=0 ; ispawn_parms[i]); - Qprintf (f, "%d\n", current_skill); - Qprintf (f, "%s\n", sv.name); - Qprintf (f, "%f\n",sv.time); + FS_Printf (f, "%f\n", svs.clients->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; - Qclose (f); + FS_Close (f); - for (i=0 ; ispawn_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"); } //============================================================================ @@ -662,9 +627,10 @@ void Host_Loadgame_f (void) 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) { @@ -673,10 +639,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) { @@ -692,16 +658,17 @@ void Host_Name_f (void) 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; - + strcpy (host_client->old_name, newName); + sv_player->v->netname = PR_SetString(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); } - + void Host_Version_f (void) { Con_Printf ("Version: %s build %s\n", gamename, buildstring); @@ -711,11 +678,11 @@ 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) { @@ -734,34 +701,40 @@ void Host_Say(qboolean teamonly) if (Cmd_Argc () < 2) return; - 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; + save = host_client; - strcat (text, p); - strcat (text, "\n"); + 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 + Con_Printf("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, client = svs.clients; j < svs.maxclients; j++, client++) { if (!client || !client->active || !client->spawned) continue; - if (teamplay.integer && teamonly && client->edict->v.team != save->edict->v.team) + if (teamplay.integer && teamonly && client->edict->v->team != save->edict->v->team) continue; host_client = client; SV_ClientPrintf("%s", text); @@ -788,45 +761,62 @@ 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 + Con_Printf("Host_Say: 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))) + if (strcasecmp(client->name, Cmd_Argv(1))) continue; host_client = client; SV_ClientPrintf("%s", text); @@ -841,17 +831,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", cl_color.integer >> 4, cl_color.integer & 15); - Con_Printf ("color <0-13> [0-13]\n"); + Con_Printf ("color <0-15> [0-15]\n"); return; } @@ -862,7 +853,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) @@ -871,7 +862,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) @@ -886,14 +877,18 @@ void Host_Color_f(void) { 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 ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors))) + val->_float = playercolor; host_client->colors = playercolor; - host_client->edict->v.team = bottom + 1; + host_client->old_colors = playercolor; + sv_player->v->team = bottom + 1; // send notification to all clients MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); @@ -915,14 +910,14 @@ void Host_Kill_f (void) return; } - if (sv_player->v.health <= 0) + if (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"); } @@ -934,7 +929,7 @@ Host_Pause_f */ void Host_Pause_f (void) { - + if (cmd_source == src_command) { Cmd_ForwardToServer (); @@ -948,11 +943,11 @@ void Host_Pause_f (void) if (sv.paused) { - SV_BroadcastPrintf ("%s paused the game\n", pr_strings + sv_player->v.netname); + SV_BroadcastPrintf ("%s paused the game\n", PR_GetString(sv_player->v->netname)); } else { - SV_BroadcastPrintf ("%s unpaused the game\n",pr_strings + sv_player->v.netname); + SV_BroadcastPrintf ("%s unpaused the game\n", PR_GetString(sv_player->v->netname)); } // send notification to all clients @@ -961,6 +956,40 @@ void Host_Pause_f (void) } } +/* +====================== +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 ((val = GETEDICTFIELDVALUE(sv_player, eval_pmodel))) + val->_float = i; +} + //=========================================================================== @@ -982,7 +1011,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); @@ -996,11 +1025,11 @@ Host_Spawn_f */ void Host_Spawn_f (void) { - int i; - client_t *client; - edict_t *ent; + int i; + client_t *client; + edict_t *ent; func_t RestoreGame; - dfunction_t *f; + mfunction_t *f; if (cmd_source == src_command) { @@ -1015,10 +1044,12 @@ void Host_Spawn_f (void) } // 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 + ent = sv_player; + + // run the entrance script if (sv.loadgame) { // loaded games are fully initialized already @@ -1036,24 +1067,11 @@ void Host_Spawn_f (void) } else { - eval_t *val; - // set up the edict - ent = host_client->edict; - - 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; - // 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"); @@ -1065,7 +1083,7 @@ 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); @@ -1073,16 +1091,16 @@ void Host_Spawn_f (void) { 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); @@ -1090,9 +1108,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); @@ -1109,15 +1125,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, ent->v->angles[i] ); MSG_WriteAngle (&host_client->message, 0 ); SV_WriteClientdataToMessage (sv_player, &host_client->message); @@ -1155,11 +1170,11 @@ 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) { @@ -1190,7 +1205,7 @@ void Host_Kick_f (void) { 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; } } @@ -1198,10 +1213,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; @@ -1211,7 +1228,8 @@ void Host_Kick_f (void) if (Cmd_Argc() > 2) { - message = COM_Parse(Cmd_Args()); + message = Cmd_Args(); + COM_ParseToken(&message); if (byNumber) { message++; // skip the # @@ -1226,7 +1244,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; @@ -1247,9 +1265,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) { @@ -1281,21 +1299,21 @@ 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; + 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; + 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')); + 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')); + sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2')); } break; @@ -1306,7 +1324,7 @@ void Host_Give_f (void) val->_float = v; } - sv_player->v.ammo_shells = v; + sv_player->v->ammo_shells = v; break; case 'n': if (gamemode == GAME_ROGUE) @@ -1314,13 +1332,13 @@ void Host_Give_f (void) if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1))) { 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; } } else { - sv_player->v.ammo_nails = v; + sv_player->v->ammo_nails = v; } break; case 'l': @@ -1330,8 +1348,8 @@ void Host_Give_f (void) 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; @@ -1342,13 +1360,13 @@ void Host_Give_f (void) 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': @@ -1358,13 +1376,13 @@ void Host_Give_f (void) 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; + sv_player->v->health = v; break; case 'c': if (gamemode == GAME_ROGUE) @@ -1373,13 +1391,13 @@ void Host_Give_f (void) 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': @@ -1389,8 +1407,8 @@ void Host_Give_f (void) 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; @@ -1405,7 +1423,7 @@ edict_t *FindViewthing (void) for (i=0 ; iv.classname, "viewthing") ) + if (!strcmp (PR_GetString(e->v->classname), "viewthing")) return e; } Con_Printf ("No viewthing on map\n"); @@ -1432,9 +1450,9 @@ void Host_Viewmodel_f (void) 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; } /* @@ -1451,13 +1469,13 @@ 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; } @@ -1478,17 +1496,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); } /* @@ -1505,13 +1523,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); } /* @@ -1534,8 +1552,13 @@ void Host_Startdemos_f (void) if (cls.state == ca_dedicated) { - 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; } @@ -1550,6 +1573,10 @@ void Host_Startdemos_f (void) for (i=1 ; i