X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host_cmd.c;h=528af90a599c6503c00eec09d7532ebde48feac9;hb=ddb7747373ae239fb67996cffd6a7d2bdbb1cf6a;hp=000e43a9edb27d97241e2716047f9434b71f92e2;hpb=ef35a088cb3ab1900acdbd5285465cd845368e79;p=xonotic%2Fdarkplaces.git diff --git a/host_cmd.c b/host_cmd.c index 000e43a9..528af90a 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -24,6 +24,9 @@ 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 +76,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,8 +112,14 @@ void Host_God_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + if (!sv_player) + return; + + 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) ) @@ -127,9 +136,15 @@ void Host_Notarget_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + if (!sv_player) return; + 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"); @@ -147,9 +162,15 @@ void Host_Noclip_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + if (!sv_player) return; + 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; @@ -179,8 +200,14 @@ void Host_Fly_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + if (!sv_player) + return; + + 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) { @@ -214,7 +241,7 @@ void Host_Ping_f (void) } SV_ClientPrintf ("Client ping times:\n"); - for (i=0, client = svs.clients ; iactive) continue; @@ -259,6 +286,8 @@ void Host_Map_f (void) svs.serverflags = 0; // haven't completed an episode yet strcpy (sv_spawnmap, Cmd_Argv(1)); + if (host_initialized) + Host_PerformSpawnServerAndLoadGame(); } /* @@ -282,6 +311,8 @@ void Host_Changelevel_f (void) } SV_SaveSpawnparms (); strcpy (sv_spawnmap, Cmd_Argv(1)); + if (host_initialized) + Host_PerformSpawnServerAndLoadGame(); } /* @@ -299,6 +330,8 @@ void Host_Restart_f (void) if (cmd_source != src_command) return; strcpy (sv_spawnmap, sv.name); + if (host_initialized) + Host_PerformSpawnServerAndLoadGame(); } /* @@ -378,7 +411,7 @@ 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"); return; @@ -390,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) @@ -408,18 +452,8 @@ 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"); + strlcpy (name, Cmd_Argv(1), sizeof (name)); + FS_DefaultExtension (name, ".sav", sizeof (name)); Con_Printf ("Saving game to %s...\n", name); f = FS_Open (name, "w", false); @@ -433,7 +467,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.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); @@ -479,7 +513,7 @@ void Host_Loadgame_f (void) } strcpy (sv_loadgame, Cmd_Argv(1)); - FS_DefaultExtension (sv_loadgame, ".sav"); + FS_DefaultExtension (sv_loadgame, ".sav", sizeof (sv_loadgame)); Con_Printf ("Loading game from %s...\n", sv_loadgame); } @@ -535,6 +569,7 @@ 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) { @@ -613,7 +648,7 @@ 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)) @@ -639,10 +674,9 @@ void Host_Name_f (void) } 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)); if (cmd_source == src_command) { @@ -665,7 +699,7 @@ 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); } @@ -732,8 +766,8 @@ 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)) + 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; @@ -809,14 +843,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))) - { + 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); - break; - } - } host_client = save; } @@ -890,7 +919,7 @@ 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); } } @@ -1084,8 +1113,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); @@ -1173,15 +1204,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 +1212,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; @@ -1272,9 +1292,15 @@ void Host_Give_f (void) return; } - if (pr_global_struct->deathmatch || !sv_player) + 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)); @@ -1544,7 +1570,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]) { @@ -1565,7 +1591,7 @@ void Host_Startdemos_f (void) Con_DPrintf ("%i demo(s) in loop\n", c); for (i=1 ; i