==================
*/
-extern qboolean host_shuttingdown;
void Host_Quit_f (void)
{
- host_shuttingdown = true;
- CL_Disconnect ();
- Host_ShutdownServer(false);
-
Sys_Quit ();
}
*/
void Host_Status_f (void)
{
+ const char *protocolname;
client_t *client;
int seconds, minutes, hours = 0, j, players;
void (*print) (const char *fmt, ...);
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;
+ case PROTOCOL_DARKPLACES6: protocolname = "PROTOCOL_DARKPLACES6";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, svs.maxclients);
for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
{
if (!client->active)
continue;
- seconds = (int)(realtime - client->netconnection->connecttime);
+ seconds = (int)(realtime - client->connecttime);
minutes = seconds / 60;
if (minutes)
{
else
hours = 0;
print ("#%-2u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v->frags, hours, minutes, seconds);
- print (" %s\n", client->netconnection->address);
+ print (" %s\n", client->netconnection ? client->netconnection->address : "botclient");
}
}
return;
}
- if (!sv_player)
- return;
-
if (!allowcheats)
{
- SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+ 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");
+ host_client->edict->v->flags = (int)host_client->edict->v->flags ^ FL_GODMODE;
+ if (!((int)host_client->edict->v->flags & FL_GODMODE) )
+ SV_ClientPrint("godmode OFF\n");
else
- SV_ClientPrintf ("godmode ON\n");
+ SV_ClientPrint("godmode ON\n");
}
void Host_Notarget_f (void)
return;
}
- if (!sv_player)
- return;
-
if (!allowcheats)
{
- SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+ 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");
+ host_client->edict->v->flags = (int)host_client->edict->v->flags ^ FL_NOTARGET;
+ if (!((int)host_client->edict->v->flags & FL_NOTARGET) )
+ SV_ClientPrint("notarget OFF\n");
else
- SV_ClientPrintf ("notarget ON\n");
+ SV_ClientPrint("notarget ON\n");
}
qboolean noclip_anglehack;
return;
}
- if (!sv_player)
- return;
-
if (!allowcheats)
{
- SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+ SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
return;
}
- if (sv_player->v->movetype != MOVETYPE_NOCLIP)
+ if (host_client->edict->v->movetype != MOVETYPE_NOCLIP)
{
noclip_anglehack = true;
- sv_player->v->movetype = MOVETYPE_NOCLIP;
- SV_ClientPrintf ("noclip ON\n");
+ host_client->edict->v->movetype = MOVETYPE_NOCLIP;
+ SV_ClientPrint("noclip ON\n");
}
else
{
noclip_anglehack = false;
- sv_player->v->movetype = MOVETYPE_WALK;
- SV_ClientPrintf ("noclip OFF\n");
+ host_client->edict->v->movetype = MOVETYPE_WALK;
+ SV_ClientPrint("noclip OFF\n");
}
}
return;
}
- if (!sv_player)
- return;
-
if (!allowcheats)
{
- SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+ SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
return;
}
- if (sv_player->v->movetype != MOVETYPE_FLY)
+ if (host_client->edict->v->movetype != MOVETYPE_FLY)
{
- sv_player->v->movetype = MOVETYPE_FLY;
- SV_ClientPrintf ("flymode ON\n");
+ host_client->edict->v->movetype = MOVETYPE_FLY;
+ SV_ClientPrint("flymode ON\n");
}
else
{
- sv_player->v->movetype = MOVETYPE_WALK;
- SV_ClientPrintf ("flymode OFF\n");
+ host_client->edict->v->movetype = MOVETYPE_WALK;
+ SV_ClientPrint("flymode OFF\n");
}
}
return;
}
- SV_ClientPrintf ("Client ping times:\n");
+ SV_ClientPrint("Client ping times:\n");
for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++)
{
if (!client->active)
for (j=0 ; j<NUM_PING_TIMES ; j++)
total+=client->ping_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);
}
}
{
char level[MAX_QPATH];
+ if (Cmd_Argc() != 2)
+ {
+ Con_Print("map <levelname> : start a new game (kicks off all players)\n");
+ return;
+ }
+
if (cmd_source != src_command)
return;
+ SCR_BeginLoadingPlaque ();
cls.demonum = -1; // stop demo loop in case this fails
CL_Disconnect ();
Host_ShutdownServer(false);
- key_dest = key_game; // remove console or menu
- SCR_BeginLoadingPlaque ();
+ // remove console or menu
+ key_dest = key_game;
+ key_consoleactive = 0;
svs.serverflags = 0; // haven't completed an episode yet
allowcheats = sv_cheats.integer != 0;
strcpy(level, Cmd_Argv(1));
SV_SpawnServer(level);
if (sv.active && cls.state == ca_disconnected)
- CL_EstablishConnection("local");
+ CL_EstablishConnection("local:1");
}
/*
if (Cmd_Argc() != 2)
{
- Con_Printf ("changelevel <levelname> : continue game on a new level\n");
+ Con_Print("changelevel <levelname> : 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;
}
+ if (cmd_source != src_command)
+ return;
+
+ // remove console or menu
+ key_dest = key_game;
+ key_consoleactive = 0;
+
SV_SaveSpawnparms ();
+ SCR_BeginLoadingPlaque();
allowcheats = sv_cheats.integer != 0;
strcpy(level, Cmd_Argv(1));
SV_SpawnServer(level);
if (sv.active && cls.state == ca_disconnected)
- CL_EstablishConnection("local");
+ CL_EstablishConnection("local:1");
}
/*
{
char mapname[MAX_QPATH];
- if (cls.demoplayback || !sv.active)
+ if (Cmd_Argc() != 1)
+ {
+ Con_Print("restart : restart current level\n");
return;
-
+ }
+ if (!sv.active || cls.demoplayback)
+ {
+ Con_Print("Only the server may restart\n");
+ return;
+ }
if (cmd_source != src_command)
return;
+
+ // remove console or menu
+ key_dest = key_game;
+ key_consoleactive = 0;
+
+ SCR_BeginLoadingPlaque();
allowcheats = sv_cheats.integer != 0;
strcpy(mapname, sv.name);
SV_SpawnServer(mapname);
if (sv.active && cls.state == ca_disconnected)
- CL_EstablishConnection("local");
+ CL_EstablishConnection("local:1");
}
/*
*/
void Host_Reconnect_f (void)
{
+ if (Cmd_Argc() != 1)
+ {
+ Con_Print("reconnect : wait for signon messages again\n");
+ return;
+ }
+ if (!cls.signon)
+ {
+ //Con_Print("reconnect: no signon, ignoring reconnect\n");
+ return;
+ }
SCR_BeginLoadingPlaque();
cls.signon = 0; // need new connection messages
}
*/
void Host_Connect_f (void)
{
+ if (Cmd_Argc() != 2)
+ {
+ Con_Print("connect <serveraddress> : connect to a multiplayer game\n");
+ return;
+ }
CL_EstablishConnection(Cmd_Argv(1));
}
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 (i > 0)
{
- Con_Printf("Can't save multiplayer games.\n");
+ Con_Print("Can't save multiplayer games.\n");
return;
}
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;
}
}
if (Cmd_Argc() != 2)
{
- Con_Printf ("save <savename> : save a game\n");
+ Con_Print("save <savename> : 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;
}
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 ; i<NUM_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);
+ 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<MAX_LIGHTSTYLES ; i++)
{
if (sv.lightstyles[i])
- FS_Printf (f, "%s\n", sv.lightstyles[i]);
+ FS_Printf(f, "%s\n", sv.lightstyles[i]);
else
- FS_Printf (f,"m\n");
+ FS_Print(f,"m\n");
}
FS_Flush (f);
}
FS_Close (f);
- Con_Printf ("done.\n");
+ Con_Print("done.\n");
}
if (Cmd_Argc() != 2)
{
- Con_Printf ("load <savename> : load a game\n");
+ Con_Print("load <savename> : load a game\n");
return;
}
strcpy (filename, Cmd_Argv(1));
FS_DefaultExtension (filename, ".sav", sizeof (filename));
- Con_Printf ("Loading game from %s...\n", filename);
+ Con_Printf("Loading game from %s...\n", filename);
cls.demonum = -1; // stop demo loop in case this fails
f = FS_Open (filename, "r", false);
if (!f)
{
- Con_Printf ("ERROR: couldn't open.\n");
+ Con_Print("ERROR: couldn't open.\n");
return;
}
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;
}
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
// load the edicts out of the savegame file
// -1 is the globals
entnum = -1;
- while (!FS_Eof (f))
+ for (;;)
{
+ r = EOF;
for (i = 0;i < (int)sizeof(buf) - 1;i++)
{
r = FS_Getc (f);
break;
}
}
+ if (r == EOF)
+ break;
if (i == sizeof(buf)-1)
Host_Error ("Loadgame buffer overflow");
buf[i] = 0;
// 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");
}
//============================================================================
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;
}
else
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 (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
+ 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;
- MSG_WriteByte(&sv.reliable_datagram, svc_updatename);
- MSG_WriteByte(&sv.reliable_datagram, host_client->number);
- MSG_WriteString(&sv.reliable_datagram, host_client->name);
+ // point the string back at updateclient->name to keep it safe
+ strlcpy (host_client->name, newName, sizeof (host_client->name));
+ host_client->edict->v->netname = PR_SetString(host_client->name);
+ if (strcmp(host_client->old_name, host_client->name))
+ {
+ if (host_client->spawned)
+ SV_BroadcastPrintf("%s changed name to %s\n", host_client->old_name, host_client->name);
+ strcpy(host_client->old_name, 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);
+ }
}
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)
{
client_t *save;
- int j;
- const char *p1, *p2;
+ int j, quoted;
+ const char *p1;
+ char *p2;
// LordHavoc: 256 char say messages
unsigned char text[256];
qboolean fromServer = false;
if (Cmd_Argc () < 2)
return;
- save = host_client;
+ if (!teamplay.integer)
+ teamonly = false;
// turn on color set 1
- if (!fromServer)
- sprintf (text, "%c%s: ", 1, host_client->name);
- else
- sprintf (text, "%c<%s> ", 1, hostname.string);
-
p1 = Cmd_Args();
- p2 = p1 + strlen(p1);
- // remove trailing newlines
- while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
- p2--;
- // remove quotes if present
- if (*p1 == '"')
+ quoted = false;
+ if (*p1 == '\"')
{
+ quoted = true;
p1++;
- if (p2[-1] == '"')
- p2--;
- 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'))
+ if (!fromServer)
+ snprintf (text, sizeof(text), "%c%s: %s", 1, host_client->name, p1);
+ else
+ snprintf (text, sizeof(text), "%c<%s> %s", 1, hostname.string, p1);
+ p2 = text + strlen(text);
+ while ((const char *)p2 > (const char *)text && (p2[-1] == '\r' || p2[-1] == '\n' || (p2[-1] == '\"' && quoted)))
+ {
+ if (p2[-1] == '\"' && quoted)
+ quoted = false;
+ p2[-1] = 0;
p2--;
- for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
- text[j++] = *p1++;
- text[j++] = '\n';
- text[j++] = 0;
+ }
+ strlcat(text, "\n", sizeof(text));
+ // note: save is not a valid edict if fromServer is true
+ save = host_client;
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);
+ if (host_client->spawned && (!teamonly || host_client->edict->v->team == save->edict->v->team))
+ SV_ClientPrint(text);
host_client = save;
- Sys_Printf("%s", &text[1]);
+ //Con_Print(&text[1]);
}
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--;
save = host_client;
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);
+ SV_ClientPrint(text);
host_client = save;
}
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;
}
return;
}
- if (sv_player && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
+ if (host_client->edict && (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);
- PR_ExecuteProgram (SV_ChangeTeam, "");
+ pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+ PR_ExecuteProgram (SV_ChangeTeam, "QC function SV_ChangeTeam is missing");
}
else
{
eval_t *val;
- if (sv_player)
+ if (host_client->edict)
{
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_clientcolors)))
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
val->_float = playercolor;
- sv_player->v->team = bottom + 1;
+ host_client->edict->v->team = bottom + 1;
}
host_client->colors = playercolor;
- host_client->old_colors = playercolor;
+ if (host_client->old_colors != host_client->colors)
+ {
+ host_client->old_colors = host_client->colors;
+ // 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->colors);
+ }
+ }
+}
- // send notification to all clients
- MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
- 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"};
+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->rate = rate;
}
/*
return;
}
- if (!sv_player || sv_player->v->health <= 0)
+ if (host_client->edict->v->health <= 0)
{
- SV_ClientPrintf ("Can't suicide -- already dead!\n");
+ SV_ClientPrint("Can't suicide -- already dead!\n");
return;
}
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);
}
}
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));
return;
}
- host_client->pmodel = i;
- if (sv_player && (val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)))
+ if (host_client->edict && (val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
val->_float = i;
}
{
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;
}
MSG_WriteByte (&host_client->message, svc_signonnum);
MSG_WriteByte (&host_client->message, 2);
host_client->sendsignon = true;
+
+ // reset the name change timer because the client will send name soon
+ host_client->nametime = 0;
}
/*
client_t *client;
func_t RestoreGame;
mfunction_t *f;
+ int stats[MAX_CL_STATS];
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");
- return;
- }
+ // reset name change timer again because they might want to change name
+ // again in the first 5 seconds after connecting
+ host_client->nametime = 0;
// LordHavoc: moved this above the QC calls at FrikaC's request
// send all current names, colors, and frag counts
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, "");
+ pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+ PR_ExecuteProgram (RestoreGame, "QC function RestoreGame is missing");
}
}
else
{
// set up the edict
- ED_ClearEdict(sv_player);
+ ED_ClearEdict(host_client->edict);
- //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);
+ //Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, host_client->edict->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(host_client->edict->v->netname), host_client->name);
// copy spawn parms out of the client_t
for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
// call the spawn function
pr_global_struct->time = sv.time;
- pr_global_struct->self = EDICT_TO_PROG(sv_player);
+ pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
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);
+ if ((Sys_DoubleTime() - host_client->connecttime) <= sv.time)
+ Con_Printf("%s entered the game\n", host_client->name);
PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing");
}
continue;
MSG_WriteByte (&host_client->message, svc_updatename);
MSG_WriteByte (&host_client->message, i);
- MSG_WriteString (&host_client->message, client->old_name);
+ MSG_WriteString (&host_client->message, client->name);
MSG_WriteByte (&host_client->message, svc_updatefrags);
MSG_WriteByte (&host_client->message, i);
- MSG_WriteShort (&host_client->message, client->old_frags);
+ MSG_WriteShort (&host_client->message, client->frags);
MSG_WriteByte (&host_client->message, svc_updatecolors);
MSG_WriteByte (&host_client->message, i);
- MSG_WriteByte (&host_client->message, client->old_colors);
+ MSG_WriteByte (&host_client->message, client->colors);
}
// send all current light styles
// 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 );
+ MSG_WriteAngle (&host_client->message, host_client->edict->v->angles[0], sv.protocol);
+ MSG_WriteAngle (&host_client->message, host_client->edict->v->angles[1], sv.protocol);
+ MSG_WriteAngle (&host_client->message, 0, sv.protocol);
- SV_WriteClientdataToMessage (sv_player, &host_client->message);
+ SV_WriteClientdataToMessage (host_client, host_client->edict, &host_client->message, stats);
MSG_WriteByte (&host_client->message, svc_signonnum);
MSG_WriteByte (&host_client->message, 3);
{
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;
}
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
}
return;
}
- if (!sv_player)
- return;
-
if (!allowcheats)
{
- SV_ClientPrintf("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
+ SV_ClientPrint("No cheats allowed, use sv_cheats 1 and restart level to enable.\n");
return;
}
if (t[0] == '6')
{
if (t[1] == 'a')
- sv_player->v->items = (int)sv_player->v->items | HIT_PROXIMITY_GUN;
+ host_client->edict->v->items = (int)host_client->edict->v->items | HIT_PROXIMITY_GUN;
else
- sv_player->v->items = (int)sv_player->v->items | IT_GRENADE_LAUNCHER;
+ host_client->edict->v->items = (int)host_client->edict->v->items | IT_GRENADE_LAUNCHER;
}
else if (t[0] == '9')
- sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON;
+ host_client->edict->v->items = (int)host_client->edict->v->items | HIT_LASER_CANNON;
else if (t[0] == '0')
- sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR;
+ host_client->edict->v->items = (int)host_client->edict->v->items | HIT_MJOLNIR;
else if (t[0] >= '2')
- sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
+ host_client->edict->v->items = (int)host_client->edict->v->items | (IT_SHOTGUN << (t[0] - '2'));
}
else
{
if (t[0] >= '2')
- sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
+ host_client->edict->v->items = (int)host_client->edict->v->items | (IT_SHOTGUN << (t[0] - '2'));
}
break;
case 's':
- if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1)))
+ if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_shells1)))
val->_float = v;
- sv_player->v->ammo_shells = v;
+ host_client->edict->v->ammo_shells = v;
break;
case 'n':
if (gamemode == GAME_ROGUE)
{
- if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1)))
+ if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_nails1)))
{
val->_float = v;
- if (sv_player->v->weapon <= IT_LIGHTNING)
- sv_player->v->ammo_nails = v;
+ if (host_client->edict->v->weapon <= IT_LIGHTNING)
+ host_client->edict->v->ammo_nails = v;
}
}
else
{
- sv_player->v->ammo_nails = v;
+ host_client->edict->v->ammo_nails = v;
}
break;
case 'l':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(sv_player, eval_ammo_lava_nails);
+ val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_lava_nails);
if (val)
{
val->_float = v;
- if (sv_player->v->weapon > IT_LIGHTNING)
- sv_player->v->ammo_nails = v;
+ if (host_client->edict->v->weapon > IT_LIGHTNING)
+ host_client->edict->v->ammo_nails = v;
}
}
break;
case 'r':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(sv_player, eval_ammo_rockets1);
+ val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_rockets1);
if (val)
{
val->_float = v;
- if (sv_player->v->weapon <= IT_LIGHTNING)
- sv_player->v->ammo_rockets = v;
+ if (host_client->edict->v->weapon <= IT_LIGHTNING)
+ host_client->edict->v->ammo_rockets = v;
}
}
else
{
- sv_player->v->ammo_rockets = v;
+ host_client->edict->v->ammo_rockets = v;
}
break;
case 'm':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(sv_player, eval_ammo_multi_rockets);
+ val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_multi_rockets);
if (val)
{
val->_float = v;
- if (sv_player->v->weapon > IT_LIGHTNING)
- sv_player->v->ammo_rockets = v;
+ if (host_client->edict->v->weapon > IT_LIGHTNING)
+ host_client->edict->v->ammo_rockets = v;
}
}
break;
case 'h':
- sv_player->v->health = v;
+ host_client->edict->v->health = v;
break;
case 'c':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(sv_player, eval_ammo_cells1);
+ val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_cells1);
if (val)
{
val->_float = v;
- if (sv_player->v->weapon <= IT_LIGHTNING)
- sv_player->v->ammo_cells = v;
+ if (host_client->edict->v->weapon <= IT_LIGHTNING)
+ host_client->edict->v->ammo_cells = v;
}
}
else
{
- sv_player->v->ammo_cells = v;
+ host_client->edict->v->ammo_cells = v;
}
break;
case 'p':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(sv_player, eval_ammo_plasma);
+ val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_plasma);
if (val)
{
val->_float = v;
- if (sv_player->v->weapon > IT_LIGHTNING)
- sv_player->v->ammo_cells = v;
+ if (host_client->edict->v->weapon > IT_LIGHTNING)
+ host_client->edict->v->ammo_cells = v;
}
}
break;
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;
}
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;
}
int i, c;
if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
- {
- if (!sv.active)
- {
- if (gamemode == GAME_TRANSFUSION)
- Cbuf_AddText ("map bb1\n");
- else
- Cbuf_AddText ("map start\n");
- }
return;
- }
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_Printf("%i demo(s) in loop\n", c);
for (i=1 ; i<c+1 ; i++)
strlcpy (cls.demos[i-1], Cmd_Argv(i), sizeof (cls.demos[i-1]));
if (!cls.demoplayback)
return;
CL_Disconnect ();
+ Host_ShutdownServer (false);
}
static void MaxPlayers_f(void)
if (sv.active)
{
- Con_Printf("maxplayers can not be changed while a server is running.\n");
+ Con_Print("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);
+ Con_Printf("\"maxplayers\" set to \"%u\"\n", n);
if (svs.clients)
Mem_Free(svs.clients);
Cmd_AddCommand ("name", Host_Name_f);
Cvar_RegisterVariable (&cl_color);
Cmd_AddCommand ("color", Host_Color_f);
+ Cvar_RegisterVariable (&cl_rate);
+ Cmd_AddCommand ("rate", Host_Rate_f);
if (gamemode == GAME_NEHAHRA)
{
Cvar_RegisterVariable (&cl_pmodel);
projects / xonotic / darkplaces.git / blobdiff