X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=7ded7c4787ef1f0bd4e1b835564f0d45f9d6e61d;hb=1e66e1870fcf15014138a7094633c5ef54680666;hp=201efa52f865f147619a73a75fee6a8e83adbe2e;hpb=0c4c308aaa7e204924b958419f63728a9e961746;p=xonotic%2Fdarkplaces.git diff --git a/host_cmd.c b/host_cmd.c index 201efa52..7ded7c47 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); @@ -73,7 +73,7 @@ void Host_Status_f (void) print ("version: %s build %s\n", gamename, buildstring); print ("map: %s\n", sv.name); print ("players: %i active (%i max)\n\n", players, svs.maxclients); - for (j=0, client = svs.clients ; jactive) continue; @@ -109,14 +109,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 +133,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 +159,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 +197,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,8 +237,8 @@ void Host_Ping_f (void) return; } - SV_ClientPrintf ("Client ping times:\n"); - for (i=0, client = svs.clients ; iactive) continue; @@ -222,7 +246,7 @@ void Host_Ping_f (void) 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 +269,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 +282,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 +299,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 +328,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,74 +419,75 @@ 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; } - 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_Print("Can't save multiplayer games.\n"); + return; + } + if (svs.clients[i].edict->v->deadflag) + { + Con_Print("Can't savegame with a dead player\n"); + return; + } + } } 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; } - 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"); + 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]; @@ -498,12 +524,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; } @@ -512,7 +552,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; } @@ -535,10 +575,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 @@ -574,7 +615,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; @@ -613,11 +654,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.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"); } //============================================================================ @@ -630,30 +671,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); @@ -665,14 +717,14 @@ void Host_Name_f (void) // send notification to all clients MSG_WriteByte(&sv.reliable_datagram, svc_updatename); - MSG_WriteByte(&sv.reliable_datagram, host_client - svs.clients); + MSG_WriteByte(&sv.reliable_datagram, host_client->number); MSG_WriteString(&sv.reliable_datagram, host_client->name); } 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) @@ -721,9 +773,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--; @@ -732,12 +784,12 @@ void Host_Say(qboolean teamonly) text[j++] = '\n'; text[j++] = 0; - for (j = 0, host_client = svs.clients; j < svs.maxclients; j++, host_client++) - if (host_client && host_client->active && 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]); } @@ -797,9 +849,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--; @@ -809,14 +861,9 @@ void Host_Tell_f(void) text[j++] = 0; save = host_client; - for (j = 0, host_client = svs.clients; j < svs.maxclients; j++, host_client++) - { - if (host_client->active && host_client->spawned && !strcasecmp(host_client->name, Cmd_Argv(1))) - { - 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_ClientPrint(text); host_client = save; } @@ -836,8 +883,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; } @@ -870,7 +917,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); @@ -890,11 +937,42 @@ void Host_Color_f(void) // 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); } } +cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000"}; +cvar_t sv_maxrate = {CVAR_SAVE | CVAR_NOTIFY, "sv_maxrate", "10000"}; +void Host_Rate_f(void) +{ + int rate, maxrate; + + 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; + } + + maxrate = bound(NET_MINRATE, sv_maxrate.integer, NET_MAXRATE); + if (sv_maxrate.integer != maxrate) + Cvar_SetValueQuick(&sv_maxrate, maxrate); + + if (LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP) + host_client->netconnection->rate = bound(NET_MINRATE, rate, maxrate); +} + /* ================== Host_Kill_f @@ -910,7 +988,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; } @@ -934,14 +1012,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); } } @@ -959,7 +1037,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)); @@ -991,13 +1069,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; } @@ -1021,22 +1099,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); @@ -1051,7 +1131,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, ""); @@ -1074,7 +1154,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"); } @@ -1084,8 +1164,10 @@ void Host_Spawn_f (void) 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->old_name); @@ -1148,7 +1230,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; } @@ -1173,15 +1255,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; @@ -1189,16 +1263,13 @@ 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 >= svs.maxclients || !(host_client = 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; @@ -1226,7 +1297,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 # @@ -1238,9 +1309,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 } @@ -1272,9 +1343,15 @@ 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)); @@ -1420,7 +1497,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; } @@ -1441,7 +1518,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; } @@ -1544,9 +1621,9 @@ 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]) + if (!sv.active) { if (gamemode == GAME_TRANSFUSION) Cbuf_AddText ("map bb1\n"); @@ -1559,13 +1636,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