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);
/*
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);
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;
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) )
SV_ClientPrintf ("godmode OFF\n");
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) )
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;
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)
{
sv_player->v->movetype = MOVETYPE_FLY;
}
SV_ClientPrintf ("Client ping times:\n");
- 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;
total = 0;
for (j=0 ; j<NUM_PING_TIMES ; j++)
svs.serverflags = 0; // haven't completed an episode yet
strcpy (sv_spawnmap, Cmd_Argv(1));
+ if (host_initialized)
+ Host_PerformSpawnServerAndLoadGame();
}
/*
}
SV_SaveSpawnparms ();
strcpy (sv_spawnmap, Cmd_Argv(1));
+ if (host_initialized)
+ Host_PerformSpawnServerAndLoadGame();
}
/*
if (cmd_source != src_command)
return;
strcpy (sv_spawnmap, sv.name);
+ if (host_initialized)
+ Host_PerformSpawnServerAndLoadGame();
}
/*
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;
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");
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");
return;
Host_SavegameComment (comment);
FS_Printf (f, "%s\n", comment);
for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
- FS_Printf (f, "%f\n", svs.connectedclients[0]->spawn_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);
str = FS_Getline (f);
sscanf (str, "%f\n",&time);
+ allowcheats = sv_cheats.integer != 0;
SV_SpawnServer (mapname);
if (!sv.active)
{
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))
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))
+ 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;
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)))
+ 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);
host_client = save;
}
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);
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;
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)
{
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));
if (sv_loadgame[0])
Host_PerformLoadGame(sv_loadgame);
else if (sv_spawnmap[0])
+ {
+ allowcheats = sv_cheats.integer != 0;
SV_SpawnServer(sv_spawnmap);
+ }
sv_loadgame[0] = 0;
sv_spawnmap[0] = 0;
if (sv.active && cls.state == ca_disconnected)
- Cmd_ExecuteString ("connect local", src_command);
+ Cbuf_AddText ("connect local");
+}
+
+static void MaxPlayers_f(void)
+{
+ int n;
+
+ if (Cmd_Argc() != 2)
+ {
+ Con_Printf("\"maxplayers\" is \"%u\"\n", svs.maxclients);
+ return;
+ }
+
+ if (sv.active)
+ {
+ Con_Printf("maxplayers can not be changed while a server is running.\n");
+ return;
+ }
+
+ n = atoi(Cmd_Argv(1));
+ n = bound(1, n, MAX_SCOREBOARD);
+ Con_Printf ("\"maxplayers\" set to \"%u\"\n", n);
+
+ if (svs.clients)
+ Mem_Free(svs.clients);
+ svs.maxclients = n;
+ svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients);
+ if (n == 1)
+ Cvar_Set ("deathmatch", "0");
+ else
+ Cvar_Set ("deathmatch", "1");
}
//=============================================================================
Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
Cmd_AddCommand ("spawn", Host_Spawn_f);
Cmd_AddCommand ("begin", Host_Begin_f);
+ Cmd_AddCommand ("maxplayers", MaxPlayers_f);
+
+ Cvar_RegisterVariable(&sv_cheats);
}