X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=bdae5cf8227d10202e48b1cf481cc164f8c58f38;hb=d1986a0cb01eaeab540d54fde3e8a9f8128ce3c2;hp=43633d823e590e7687b348db4463f55a45547a47;hpb=7236ab62194b320c2c205df896668c3af392669e;p=xonotic%2Fdarkplaces.git diff --git a/host_cmd.c b/host_cmd.c index 43633d82..bdae5cf8 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" int current_skill; -char sv_spawnmap[MAX_QPATH]; -char sv_loadgame[MAX_OSPATH]; +cvar_t sv_cheats = {0, "sv_cheats", "0"}; +qboolean allowcheats = false; mfunction_t *ED_FindFunction (char *name); @@ -50,6 +50,7 @@ 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, ...); @@ -66,16 +67,27 @@ void Host_Status_f (void) else print = SV_ClientPrintf; - for (players = 0, j = 0;j < MAX_SCOREBOARD;j++) - if (svs.connectedclients[j]) + 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, min(sv_maxplayers.integer, MAX_SCOREBOARD)); - for (j = 0;j < MAX_SCOREBOARD;j++) + print ("players: %i active (%i max)\n\n", players, svs.maxclients); + for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++) { - if (!(client = svs.connectedclients[j])) + if (!client->active) continue; seconds = (int)(realtime - client->netconnection->connecttime); minutes = seconds / 60; @@ -109,14 +121,20 @@ void Host_God_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + 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) ) - SV_ClientPrintf ("godmode OFF\n"); + SV_ClientPrint("godmode OFF\n"); else - SV_ClientPrintf ("godmode ON\n"); + SV_ClientPrint("godmode ON\n"); } void Host_Notarget_f (void) @@ -127,14 +145,20 @@ void Host_Notarget_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + 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) ) - SV_ClientPrintf ("notarget OFF\n"); + SV_ClientPrint("notarget OFF\n"); else - SV_ClientPrintf ("notarget ON\n"); + SV_ClientPrint("notarget ON\n"); } qboolean noclip_anglehack; @@ -147,20 +171,26 @@ void Host_Noclip_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + 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) { noclip_anglehack = true; sv_player->v->movetype = MOVETYPE_NOCLIP; - SV_ClientPrintf ("noclip ON\n"); + SV_ClientPrint("noclip ON\n"); } else { noclip_anglehack = false; sv_player->v->movetype = MOVETYPE_WALK; - SV_ClientPrintf ("noclip OFF\n"); + SV_ClientPrint("noclip OFF\n"); } } @@ -179,18 +209,24 @@ void Host_Fly_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + 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) { sv_player->v->movetype = MOVETYPE_FLY; - SV_ClientPrintf ("flymode ON\n"); + SV_ClientPrint("flymode ON\n"); } else { sv_player->v->movetype = MOVETYPE_WALK; - SV_ClientPrintf ("flymode OFF\n"); + SV_ClientPrint("flymode OFF\n"); } } @@ -213,16 +249,16 @@ void Host_Ping_f (void) return; } - SV_ClientPrintf ("Client ping times:\n"); - for (i = 0;i < MAX_SCOREBOARD;i++) + SV_ClientPrint("Client ping times:\n"); + for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) { - if (!(client = svs.connectedclients[i])) + 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); + SV_ClientPrintf("%4i %s\n", (int)(total*1000), client->name); } } @@ -245,6 +281,8 @@ command from the console. Active clients are kicked off. */ void Host_Map_f (void) { + char level[MAX_QPATH]; + if (cmd_source != src_command) return; @@ -256,9 +294,12 @@ void Host_Map_f (void) key_dest = key_game; // remove console or menu SCR_BeginLoadingPlaque (); - svs.serverflags = 0; // haven't completed an episode yet - strcpy (sv_spawnmap, Cmd_Argv(1)); + allowcheats = sv_cheats.integer != 0; + strcpy(level, Cmd_Argv(1)); + SV_SpawnServer(level); + if (sv.active && cls.state == ca_disconnected) + CL_EstablishConnection("local:1"); } /* @@ -270,18 +311,24 @@ Goes to a new map, taking all clients along */ void Host_Changelevel_f (void) { + char level[MAX_QPATH]; + if (Cmd_Argc() != 2) { - Con_Printf ("changelevel : continue game on a new level\n"); + Con_Print("changelevel : continue game on a new level\n"); return; } if (!sv.active || cls.demoplayback) { - Con_Printf ("Only the server may changelevel\n"); + Con_Print("Only the server may changelevel\n"); return; } SV_SaveSpawnparms (); - strcpy (sv_spawnmap, Cmd_Argv(1)); + allowcheats = sv_cheats.integer != 0; + strcpy(level, Cmd_Argv(1)); + SV_SpawnServer(level); + if (sv.active && cls.state == ca_disconnected) + CL_EstablishConnection("local:1"); } /* @@ -293,12 +340,18 @@ 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 (sv_spawnmap, sv.name); + allowcheats = sv_cheats.integer != 0; + strcpy(mapname, sv.name); + SV_SpawnServer(mapname); + if (sv.active && cls.state == ca_disconnected) + CL_EstablishConnection("local:1"); } /* @@ -378,30 +431,30 @@ void Host_Savegame_f (void) if (cmd_source != src_command) return; - if (!sv.active) + if (cls.state != ca_connected || !sv.active) { - Con_Printf ("Not playing a local game.\n"); + Con_Print("Not playing a local game.\n"); return; } if (cl.intermission) { - Con_Printf ("Can't save in intermission.\n"); + Con_Print("Can't save in intermission.\n"); return; } - for (i = 0;i < MAX_SCOREBOARD;i++) + for (i = 0;i < svs.maxclients;i++) { - if (svs.connectedclients[i]) + if (svs.clients[i].active) { if (i > 0) { - Con_Printf("Can't save multiplayer games.\n"); + Con_Print("Can't save multiplayer games.\n"); return; } - if (svs.connectedclients[i]->edict->v->deadflag) + if (svs.clients[i].edict->v->deadflag) { - Con_Printf("Can't savegame with a dead player\n"); + Con_Print("Can't savegame with a dead player\n"); return; } } @@ -409,45 +462,44 @@ void Host_Savegame_f (void) if (Cmd_Argc() != 2) { - Con_Printf ("save : save a game\n"); + Con_Print("save : save a game\n"); return; } if (strstr(Cmd_Argv(1), "..")) { - Con_Printf ("Relative pathnames are not allowed.\n"); + Con_Print("Relative pathnames are not allowed.\n"); return; } - strncpy (name, Cmd_Argv(1), sizeof (name) - 1); - name[sizeof (name) - 1] = '\0'; - FS_DefaultExtension (name, ".sav"); + strlcpy (name, Cmd_Argv(1), sizeof (name)); + FS_DefaultExtension (name, ".sav", sizeof (name)); - Con_Printf ("Saving game to %s...\n", name); + Con_Printf("Saving game to %s...\n", name); f = FS_Open (name, "w", false); if (!f) { - Con_Printf ("ERROR: couldn't open.\n"); + Con_Print("ERROR: couldn't open.\n"); return; } - FS_Printf (f, "%i\n", SAVEGAME_VERSION); + FS_Printf(f, "%i\n", SAVEGAME_VERSION); Host_SavegameComment (comment); - FS_Printf (f, "%s\n", comment); + FS_Printf(f, "%s\n", comment); for (i=0 ; ispawn_parms[i]); - FS_Printf (f, "%d\n", current_skill); - FS_Printf (f, "%s\n", sv.name); - FS_Printf (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 : load a game\n"); - return; - } - - strcpy (sv_loadgame, Cmd_Argv(1)); - FS_DefaultExtension (sv_loadgame, ".sav"); - - Con_Printf ("Loading game from %s...\n", sv_loadgame); -} - -void Host_PerformLoadGame(char *name) { qfile_t *f; + char filename[MAX_QPATH]; char mapname[MAX_QPATH]; float time, tfloat; char buf[32768]; @@ -500,12 +536,26 @@ void Host_PerformLoadGame(char *name) int version; float spawn_parms[NUM_SPAWN_PARMS]; + if (cmd_source != src_command) + return; + + if (Cmd_Argc() != 2) + { + Con_Print("load : load a game\n"); + return; + } + + strcpy (filename, Cmd_Argv(1)); + FS_DefaultExtension (filename, ".sav", sizeof (filename)); + + Con_Printf("Loading game from %s...\n", filename); + cls.demonum = -1; // stop demo loop in case this fails - f = FS_Open (name, "r", false); + f = FS_Open (filename, "r", false); if (!f) { - Con_Printf ("ERROR: couldn't open.\n"); + Con_Print("ERROR: couldn't open.\n"); return; } @@ -514,7 +564,7 @@ void Host_PerformLoadGame(char *name) if (version != SAVEGAME_VERSION) { FS_Close (f); - Con_Printf ("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION); + Con_Printf("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION); return; } @@ -537,10 +587,11 @@ void Host_PerformLoadGame(char *name) str = FS_Getline (f); sscanf (str, "%f\n",&time); + allowcheats = sv_cheats.integer != 0; SV_SpawnServer (mapname); if (!sv.active) { - Con_Printf ("Couldn't load map\n"); + Con_Print("Couldn't load map\n"); return; } sv.paused = true; // pause until all clients connect @@ -615,11 +666,11 @@ void Host_PerformLoadGame(char *name) FS_Close (f); for (i = 0;i < NUM_SPAWN_PARMS;i++) - svs.connectedclients[0]->spawn_parms[i] = spawn_parms[i]; + svs.clients[0].spawn_parms[i] = spawn_parms[i]; // 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"); + CL_EstablishConnection("local:1"); } //============================================================================ @@ -632,30 +683,41 @@ Host_Name_f cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"}; void Host_Name_f (void) { + int i, j; char newName[sizeof(host_client->name)]; if (Cmd_Argc () == 1) { - Con_Printf ("\"name\" is \"%s\"\n", cl_name.string); + Con_Printf("\"name\" is \"%s\"\n", cl_name.string); return; } if (Cmd_Argc () == 2) - strncpy(newName, Cmd_Argv(1), sizeof(host_client->name) - 1); + strlcpy (newName, Cmd_Argv(1), sizeof (newName)); else - strncpy(newName, Cmd_Args(), sizeof(host_client->name) - 1); - newName[sizeof(host_client->name) - 1] = 0; + strlcpy (newName, Cmd_Args(), sizeof (newName)); + + for (i = 0, j = 0;newName[i];i++) + if (newName[i] != '\r' && newName[i] != '\n') + newName[j++] = newName[i]; + newName[j] = 0; if (cmd_source == src_command) { - if (strcmp(cl_name.string, newName) == 0) - return; Cvar_Set ("_cl_name", newName); if (cls.state == ca_connected) Cmd_ForwardToServer (); return; } + if (sv.time < host_client->nametime) + { + SV_ClientPrintf("You can't change name more than once every 5 seconds!\n"); + return; + } + + host_client->nametime = sv.time + 5; + 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); @@ -674,7 +736,7 @@ void Host_Name_f (void) void Host_Version_f (void) { - Con_Printf ("Version: %s build %s\n", gamename, buildstring); + Con_Printf("Version: %s build %s\n", gamename, buildstring); } void Host_Say(qboolean teamonly) @@ -723,9 +785,9 @@ void Host_Say(qboolean teamonly) if (p2[-1] == '"') p2--; else if (fromServer) - Con_Printf("Host_Say: missing end quote\n"); + Con_Print("Host_Say: missing end quote\n"); else - SV_ClientPrintf("Host_Say: missing end quote\n"); + SV_ClientPrint("Host_Say: missing end quote\n"); } while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) p2--; @@ -734,12 +796,12 @@ void Host_Say(qboolean teamonly) text[j++] = '\n'; text[j++] = 0; - 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); + 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_ClientPrint(text); host_client = save; - Sys_Printf("%s", &text[1]); + Sys_Print(&text[1]); } @@ -799,9 +861,9 @@ void Host_Tell_f(void) if (p2[-1] == '"') p2--; else if (fromServer) - Con_Printf("Host_Tell: missing end quote\n"); + Con_Print("Host_Tell: missing end quote\n"); else - SV_ClientPrintf("Host_Tell: missing end quote\n"); + SV_ClientPrint("Host_Tell: missing end quote\n"); } while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) p2--; @@ -811,9 +873,9 @@ void Host_Tell_f(void) text[j++] = 0; save = host_client; - 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); + for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++) + if (host_client->spawned && !strcasecmp(host_client->name, Cmd_Argv(1))) + SV_ClientPrint(text); host_client = save; } @@ -833,8 +895,8 @@ void Host_Color_f(void) if (Cmd_Argc() == 1) { - Con_Printf ("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15); - Con_Printf ("color <0-15> [0-15]\n"); + Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15); + Con_Print("color <0-15> [0-15]\n"); return; } @@ -867,7 +929,7 @@ void Host_Color_f(void) if (sv_player && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions))) { - Con_DPrintf("Calling SV_ChangeTeam\n"); + 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); @@ -892,6 +954,31 @@ void Host_Color_f(void) } } +cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000"}; +void Host_Rate_f(void) +{ + int rate; + + if (Cmd_Argc() != 2) + { + Con_Printf("\"rate\" is \"%i\"\n", cl_rate.integer); + Con_Print("rate <500-25000>\n"); + return; + } + + rate = atoi(Cmd_Argv(1)); + + if (cmd_source == src_command) + { + Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE)); + if (cls.state == ca_connected) + Cmd_ForwardToServer (); + return; + } + + host_client->netconnection->rate = rate; +} + /* ================== Host_Kill_f @@ -907,7 +994,7 @@ void Host_Kill_f (void) if (!sv_player || sv_player->v->health <= 0) { - SV_ClientPrintf ("Can't suicide -- already dead!\n"); + SV_ClientPrint("Can't suicide -- already dead!\n"); return; } @@ -931,14 +1018,14 @@ void Host_Pause_f (void) return; } if (!pausable.integer) - SV_ClientPrintf ("Pause not allowed.\n"); + SV_ClientPrint("Pause not allowed.\n"); else { sv.paused ^= 1; - SV_BroadcastPrintf ("%s %spaused the game\n", host_client->name, sv.paused ? "" : "un"); + 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); + MSG_WriteByte(&sv.reliable_datagram, svc_setpause); + MSG_WriteByte(&sv.reliable_datagram, sv.paused); } } @@ -956,7 +1043,7 @@ static void Host_PModel_f (void) if (Cmd_Argc () == 1) { - Con_Printf ("\"pmodel\" is \"%s\"\n", cl_pmodel.string); + Con_Printf("\"pmodel\" is \"%s\"\n", cl_pmodel.string); return; } i = atoi(Cmd_Argv(1)); @@ -988,13 +1075,13 @@ void Host_PreSpawn_f (void) { if (cmd_source == src_command) { - Con_Printf ("prespawn is not valid from the console\n"); + Con_Print("prespawn is not valid from the console\n"); return; } if (host_client->spawned) { - Con_Printf ("prespawn not valid -- already spawned\n"); + Con_Print("prespawn not valid -- already spawned\n"); return; } @@ -1018,22 +1105,24 @@ void Host_Spawn_f (void) if (cmd_source == src_command) { - Con_Printf("spawn is not valid from the console\n"); + Con_Print("spawn is not valid from the console\n"); return; } if (host_client->spawned) { - Con_Printf("Spawn not valid -- already spawned\n"); + Con_Print("Spawn not valid -- already spawned\n"); return; } if (!sv_player) { - Con_Printf("Host_Spawn: no edict??\n"); + Con_Print("Host_Spawn: no edict??\n"); return; } + 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); @@ -1048,7 +1137,7 @@ void Host_Spawn_f (void) if ((f = ED_FindFunction ("RestoreGame"))) if ((RestoreGame = (func_t)(f - pr_functions))) { - Con_DPrintf("Calling RestoreGame\n"); + Con_DPrint("Calling RestoreGame\n"); pr_global_struct->time = sv.time; pr_global_struct->self = EDICT_TO_PROG(sv_player); PR_ExecuteProgram (RestoreGame, ""); @@ -1071,7 +1160,7 @@ void Host_Spawn_f (void) PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing"); if ((Sys_DoubleTime() - host_client->netconnection->connecttime) <= sv.time) - Sys_Printf ("%s entered the game\n", host_client->name); + Sys_Printf("%s entered the game\n", host_client->name); PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing"); } @@ -1081,9 +1170,9 @@ void Host_Spawn_f (void) MSG_WriteByte (&host_client->message, svc_time); MSG_WriteFloat (&host_client->message, sv.time); - for (i = 0;i < MAX_SCOREBOARD;i++) + for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) { - if (!(client = svs.connectedclients[i])) + if (!client->active) continue; MSG_WriteByte (&host_client->message, svc_updatename); MSG_WriteByte (&host_client->message, i); @@ -1127,9 +1216,18 @@ void Host_Spawn_f (void) // 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, sv_player->v->angles[i] ); - MSG_WriteAngle (&host_client->message, 0 ); + if (sv.protocol == PROTOCOL_DARKPLACES5) + { + MSG_WriteAngle16i (&host_client->message, sv_player->v->angles[0]); + MSG_WriteAngle16i (&host_client->message, sv_player->v->angles[1]); + MSG_WriteAngle16i (&host_client->message, 0); + } + else + { + MSG_WriteAngle8i (&host_client->message, sv_player->v->angles[0]); + MSG_WriteAngle8i (&host_client->message, sv_player->v->angles[1]); + MSG_WriteAngle8i (&host_client->message, 0); + } SV_WriteClientdataToMessage (sv_player, &host_client->message); @@ -1147,7 +1245,7 @@ void Host_Begin_f (void) { if (cmd_source == src_command) { - Con_Printf ("begin is not valid from the console\n"); + Con_Print("begin is not valid from the console\n"); return; } @@ -1172,15 +1270,7 @@ void Host_Kick_f (void) 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; @@ -1188,22 +1278,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 >= MAX_SCOREBOARD || !(host_client = svs.connectedclients[i])) + if (i < 0 || i >= svs.maxclients || !(host_client = svs.clients + i)->active) return; byNumber = true; } else { - for (i = 0;i < MAX_SCOREBOARD;i++) + for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { - if (!(host_client = svs.connectedclients[i])) + if (!host_client->active) continue; if (strcasecmp(host_client->name, Cmd_Argv(1)) == 0) break; } } - if (i < MAX_SCOREBOARD) + if (i < svs.maxclients) { if (cmd_source == src_command) { @@ -1234,9 +1324,9 @@ void Host_Kick_f (void) message++; } if (message) - SV_ClientPrintf ("Kicked by %s: %s\n", who, message); + SV_ClientPrintf("Kicked by %s: %s\n", who, message); else - SV_ClientPrintf ("Kicked by %s\n", who); + SV_ClientPrintf("Kicked by %s\n", who); SV_DropClient (false); // kicked } @@ -1268,8 +1358,14 @@ void Host_Give_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + if (!sv_player) + return; + + if (!allowcheats) + { + SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n"); return; + } t = Cmd_Argv(1); v = atoi (Cmd_Argv(2)); @@ -1416,7 +1512,7 @@ edict_t *FindViewthing (void) if (!strcmp (PR_GetString(e->v->classname), "viewthing")) return e; } - Con_Printf ("No viewthing on map\n"); + Con_Print("No viewthing on map\n"); return NULL; } @@ -1437,7 +1533,7 @@ void Host_Viewmodel_f (void) m = Mod_ForName (Cmd_Argv(1), false, true, false); if (!m) { - Con_Printf ("Can't load %s\n", Cmd_Argv(1)); + Con_Printf("Can't load %s\n", Cmd_Argv(1)); return; } @@ -1542,7 +1638,7 @@ void Host_Startdemos_f (void) if (cls.state == ca_dedicated || COM_CheckParm("-listen")) { - if (!sv.active && !sv_spawnmap[0]) + if (!sv.active) { if (gamemode == GAME_TRANSFUSION) Cbuf_AddText ("map bb1\n"); @@ -1555,13 +1651,13 @@ void Host_Startdemos_f (void) c = Cmd_Argc() - 1; if (c > MAX_DEMOS) { - Con_Printf ("Max %i demos in demoloop\n", MAX_DEMOS); + Con_Printf("Max %i demos in demoloop\n", MAX_DEMOS); c = MAX_DEMOS; } - Con_DPrintf ("%i demo(s) in loop\n", c); + Con_DPrintf("%i demo(s) in loop\n", c); for (i=1 ; i