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);
/*
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 ; j<svs.maxclients ; j++, client++)
+ for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
{
if (!client->active)
continue;
return;
}
- if (pr_global_struct->deathmatch)
+ 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)
+ 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)
+ 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)
+ 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_ClientPrintf ("Client ping times:\n");
- for (i=0, client = svs.clients ; i<svs.maxclients ; i++, client++)
+ for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
{
if (!client->active)
continue;
cls.demonum = -1; // stop demo loop in case this fails
- SCR_BeginLoadingPlaque ();
-
CL_Disconnect ();
Host_ShutdownServer(false);
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));
+ 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;
}
- 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)
return;
}
- for (i=0 ; i<svs.maxclients ; i++)
- {
- if (svs.clients[i].active && (svs.clients[i].edict->v->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");
Host_SavegameComment (comment);
FS_Printf (f, "%s\n", comment);
for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
- FS_Printf (f, "%f\n", svs.clients->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)
{
Host_Error ("Loadgame buffer overflow");
buf[i] = 0;
start = buf;
- if (!COM_ParseToken(&start))
+ if (!COM_ParseToken(&start, false))
{
// end of file
break;
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))
return;
}
- if (host_client->name[0] && strcmp(host_client->name, "unconnected") )
- if (strcmp(host_client->name, newName) != 0)
- Con_Printf ("%s renamed to %s\n", host_client->name, newName);
- strcpy (host_client->name, newName);
- strcpy (host_client->old_name, newName);
- sv_player->v->netname = PR_SetString(host_client->name);
+ 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);
+ strcpy(host_client->old_name, newName);
+ if (sv_player)
+ sv_player->v->netname = PR_SetString(host_client->name);
+ //Con_Printf("Host_Name_f: host_client->edict->netname = %s, sv_player->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(sv_player->v->netname), 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);
+ MSG_WriteByte(&sv.reliable_datagram, svc_updatename);
+ MSG_WriteByte(&sv.reliable_datagram, host_client->number);
+ MSG_WriteString(&sv.reliable_datagram, host_client->name);
}
void Host_Say(qboolean teamonly)
{
- client_t *client;
client_t *save;
int j;
const char *p1, *p2;
if (Cmd_Argc () < 2)
return;
+ save = host_client;
+
// turn on color set 1
if (!fromServer)
sprintf (text, "%c%s: ", 1, host_client->name);
else
sprintf (text, "%c<%s> ", 1, hostname.string);
- save = host_client;
-
p1 = Cmd_Args();
p2 = p1 + strlen(p1);
// remove trailing newlines
p1++;
if (p2[-1] == '"')
p2--;
- else
+ else if (fromServer)
Con_Printf("Host_Say: missing end quote\n");
+ else
+ SV_ClientPrintf("Host_Say: missing end quote\n");
}
while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
p2--;
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)
- continue;
- host_client = client;
- 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_ClientPrintf("%s", text);
host_client = save;
Sys_Printf("%s", &text[1]);
void Host_Tell_f(void)
{
- client_t *client;
client_t *save;
int j;
const char *p1, *p2;
p1++;
if (p2[-1] == '"')
p2--;
+ else if (fromServer)
+ Con_Printf("Host_Tell: missing end quote\n");
else
- Con_Printf("Host_Say: missing end quote\n");
+ SV_ClientPrintf("Host_Tell: missing end quote\n");
}
while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
p2--;
text[j++] = 0;
save = host_client;
- for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
- {
- if (!client->active || !client->spawned)
- continue;
- if (strcasecmp(client->name, Cmd_Argv(1)))
- continue;
- host_client = client;
- 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_ClientPrintf("%s", text);
host_client = save;
}
return;
}
- if ((f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
+ if (sv_player && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
{
Con_DPrintf("Calling SV_ChangeTeam\n");
pr_global_struct->time = sv.time;
else
{
eval_t *val;
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)))
- val->_float = playercolor;
+ if (sv_player)
+ {
+ if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)))
+ val->_float = playercolor;
+ sv_player->v->team = bottom + 1;
+ }
host_client->colors = playercolor;
host_client->old_colors = playercolor;
- sv_player->v->team = bottom + 1;
// 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);
}
}
return;
}
- if (sv_player->v->health <= 0)
+ if (!sv_player || sv_player->v->health <= 0)
{
SV_ClientPrintf ("Can't suicide -- already dead!\n");
return;
else
{
sv.paused ^= 1;
-
- if (sv.paused)
- {
- SV_BroadcastPrintf ("%s paused the game\n", PR_GetString(sv_player->v->netname));
- }
- else
- {
- SV_BroadcastPrintf ("%s unpaused the game\n", PR_GetString(sv_player->v->netname));
- }
-
- // send notification to all clients
+ 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);
}
}
host_client->pmodel = i;
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)))
+ if (sv_player && (val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)))
val->_float = i;
}
{
int i;
client_t *client;
- edict_t *ent;
func_t RestoreGame;
mfunction_t *f;
if (cmd_source == src_command)
{
- Con_Printf ("spawn is not valid from the console\n");
+ Con_Printf("spawn is not valid from the console\n");
return;
}
if (host_client->spawned)
{
- Con_Printf ("Spawn not valid -- already spawned\n");
+ Con_Printf("Spawn not valid -- already spawned\n");
+ return;
+ }
+
+ if (!sv_player)
+ {
+ Con_Printf("Host_Spawn: no edict??\n");
return;
}
// send all current names, colors, and frag counts
SZ_Clear (&host_client->message);
- ent = sv_player;
-
// run the entrance script
if (sv.loadgame)
{
}
else
{
+ // set up the edict
+ ED_ClearEdict(sv_player);
+
+ //Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, sv_player->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(sv_player->v->netname), host_client->name);
+
// 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];
MSG_WriteByte (&host_client->message, svc_time);
MSG_WriteFloat (&host_client->message, sv.time);
- for (i=0, client = svs.clients ; i<svs.maxclients ; i++, client++)
+ for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
{
+ if (!client->active)
+ continue;
MSG_WriteByte (&host_client->message, svc_updatename);
MSG_WriteByte (&host_client->message, i);
MSG_WriteString (&host_client->message, client->old_name);
// 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, sv_player->v->angles[i] );
MSG_WriteAngle (&host_client->message, 0 );
SV_WriteClientdataToMessage (sv_player, &host_client->message);
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 >= 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;
if (Cmd_Argc() > 2)
{
message = Cmd_Args();
- COM_ParseToken(&message);
+ COM_ParseToken(&message, false);
if (byNumber)
{
message++; // skip the #
return;
}
- if (pr_global_struct->deathmatch)
+ 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 (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;
break;
case 's':
- if (gamemode == GAME_ROGUE)
- {
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
- val->_float = v;
- }
+ if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
+ val->_float = v;
sv_player->v->ammo_shells = v;
break;
{
int i, c;
- if (cls.state == ca_dedicated)
+ if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
{
if (!sv.active && !sv_spawnmap[0])
{
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);
}
projects / xonotic / darkplaces.git / blobdiff