==================
*/
-// LordHavoc: didn't like it asking me if I wanted to quit
-//extern void M_Menu_Quit_f (void);
-
extern qboolean host_shuttingdown;
void Host_Quit_f (void)
{
- /*
- if (key_dest != key_console && cls.state != ca_dedicated)
- {
- M_Menu_Quit_f ();
- return;
- }
- */
host_shuttingdown = true;
CL_Disconnect ();
Host_ShutdownServer(false);
*/
void Host_Status_f (void)
{
- client_t *client;
- int seconds;
- int minutes;
- int hours = 0;
- int j;
- void (*print) (char *fmt, ...);
+ client_t *client;
+ int seconds, minutes, hours = 0, j;
+ void (*print) (const char *fmt, ...);
if (cmd_source == src_command)
{
print = SV_ClientPrintf;
print ("host: %s\n", Cvar_VariableString ("hostname"));
- print ("version: %s build %i\n", gamename, buildnumber);
+ print ("version: %s build %s\n", gamename, buildstring);
if (tcpipAvailable)
print ("tcp/ip: %s\n", my_tcpip_address);
if (ipxAvailable)
======================
Host_Map_f
-handle a
+handle a
map <servername>
command from the console. Active clients are kicked off.
======================
*/
void Host_Map_f (void)
{
- int i;
- char name[MAX_QPATH];
+ int i;
+ char name[MAX_QPATH];
if (cmd_source != src_command)
return;
cls.demonum = -1; // stop demo loop in case this fails
-// SCR_BeginLoadingPlaque ();
+ SCR_BeginLoadingPlaque ();
CL_Disconnect ();
- Host_ShutdownServer(false);
+ Host_ShutdownServer(false);
key_dest = key_game; // remove console or menu
SV_SpawnServer (name);
if (!sv.active)
return;
-
+
if (cls.state != ca_dedicated)
{
+ /*
strcpy (cls.spawnparms, "");
for (i=2 ; i<Cmd_Argc() ; i++)
strcat (cls.spawnparms, Cmd_Argv(i));
strcat (cls.spawnparms, " ");
}
-
+ */
Cmd_ExecuteString ("connect local", src_command);
- }
+ }
}
/*
*/
void Host_Reconnect_f (void)
{
-// SCR_BeginLoadingPlaque ();
+ SCR_BeginLoadingPlaque ();
cls.signon = 0; // need new connection messages
}
===============
Host_SavegameComment
-Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current
+Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current
===============
*/
void Host_SavegameComment (char *text)
Con_Printf ("Relative pathnames are not allowed.\n");
return;
}
-
+
for (i=0 ; i<svs.maxclients ; i++)
{
if (svs.clients[i].active && (svs.clients[i].edict->v.health <= 0) )
sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
COM_DefaultExtension (name, ".sav");
-
+
Con_Printf ("Saving game to %s...\n", name);
f = Qopen (name, "w");
if (!f)
Con_Printf ("ERROR: couldn't open.\n");
return;
}
-
+
Qprintf (f, "%i\n", SAVEGAME_VERSION);
Host_SavegameComment (comment);
Qprintf (f, "%s\n", comment);
*/
void Host_Loadgame_f (void)
{
- char name[MAX_OSPATH];
- QFile *f;
- char mapname[MAX_QPATH];
- float time, tfloat;
- char buf[32768], *start;
- char *str;
- int i, r;
- edict_t *ent;
- int entnum;
- int version;
- float spawn_parms[NUM_SPAWN_PARMS];
+ char name[MAX_OSPATH];
+ QFile *f;
+ char mapname[MAX_QPATH];
+ float time, tfloat;
+ char buf[32768];
+ const char *start;
+ char *str;
+ int i, r;
+ edict_t *ent;
+ int entnum;
+ int version;
+ float spawn_parms[NUM_SPAWN_PARMS];
if (cmd_source != src_command)
return;
Con_Printf ("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
return;
}
+
+ SCR_BeginLoadingPlaque ();
+
str = Qgetline (f);
for (i=0 ; i<NUM_SPAWN_PARMS ; i++) {
str = Qgetline (f);
sscanf (str, "%f\n",&time);
CL_Disconnect_f ();
-
+
SV_SpawnServer (mapname);
if (!sv.active)
{
}
// load the edicts out of the savegame file
- entnum = -1; // -1 is the globals
+ // -1 is the globals
+ entnum = -1;
while (!Qeof(f))
{
for (i=0 ; i<sizeof(buf)-1 ; i++)
}
}
if (i == sizeof(buf)-1)
- Sys_Error ("Loadgame buffer overflow");
+ Host_Error ("Loadgame buffer overflow");
buf[i] = 0;
start = buf;
- start = COM_Parse(buf);
- if (!com_token[0])
- break; // end of file
+ if (!COM_ParseToken(&start))
+ {
+ // end of file
+ break;
+ }
if (strcmp(com_token,"{"))
- Sys_Error ("First token isn't a brace");
-
+ Host_Error ("First token isn't a brace");
+
if (entnum == -1)
- { // parse the global vars
+ {
+ // parse the global vars
ED_ParseGlobals (start);
}
else
- { // parse an edict
-
+ {
+ // parse an edict
ent = EDICT_NUM(entnum);
memset (&ent->v, 0, progs->entityfields * 4);
ent->free = false;
ED_ParseEdict (start, ent);
-
- // link it into the bsp tree
+
+ // link it into the bsp tree
if (!ent->free)
SV_LinkEdict (ent, false);
}
entnum++;
}
-
+
sv.num_edicts = entnum;
sv.time = time;
Con_Printf ("\"name\" is \"%s\"\n", cl_name.string);
return;
}
- //if (Cmd_Argc () == 2)
- // newName = Cmd_Argv(1);
- //else
- // newName = Cmd_Args();
- //newName[15] = 0;
+
if (Cmd_Argc () == 2)
strncpy(newName, Cmd_Argv(1), 15);
else
MSG_WriteString (&sv.reliable_datagram, host_client->name);
}
-
+
void Host_Version_f (void)
{
- Con_Printf ("Version: %s build %i\n", gamename, buildnumber);
- Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
+ Con_Printf ("Version: %s build %s\n", gamename, buildstring);
}
void Host_Say(qboolean teamonly)
{
client_t *client;
client_t *save;
- int j;
- char *p;
+ int j;
+ const char *p1, *p2;
// LordHavoc: 256 char say messages
- unsigned char text[256];
- qboolean fromServer = false;
+ unsigned char text[256];
+ qboolean fromServer = false;
if (cmd_source == src_command)
{
if (Cmd_Argc () < 2)
return;
- save = host_client;
-
- p = Cmd_Args();
-// remove quotes if present
- if (*p == '"')
- {
- p++;
- p[strlen(p)-1] = 0;
- }
-
// turn on color set 1
if (!fromServer)
- sprintf (text, "%c%s: ", 1, save->name);
+ sprintf (text, "%c%s: ", 1, host_client->name);
else
sprintf (text, "%c<%s> ", 1, hostname.string);
- j = sizeof(text) - 2 - strlen(text); // -2 for /n and null terminator
- if (strlen(p) > j)
- p[j] = 0;
+ save = host_client;
- strcat (text, p);
- strcat (text, "\n");
+ 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 == '"')
+ {
+ p1++;
+ if (p2[-1] == '"')
+ p2--;
+ else
+ Con_Printf("Host_Say: missing end quote\n");
+ }
+ while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+ p2--;
+ for (j = strlen(text);j < (sizeof(text) - 2) && p1 < p2;)
+ text[j++] = *p1++;
+ text[j++] = '\n';
+ text[j++] = 0;
for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
{
{
client_t *client;
client_t *save;
- int j;
- char *p;
- char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64)
+ int j;
+ const char *p1, *p2;
+ char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64)
+ qboolean fromServer = false;
if (cmd_source == src_command)
{
- Cmd_ForwardToServer ();
- return;
+ if (cls.state == ca_dedicated)
+ fromServer = true;
+ else
+ {
+ Cmd_ForwardToServer ();
+ return;
+ }
}
if (Cmd_Argc () < 3)
return;
- strcpy(text, host_client->name);
- strcat(text, ": ");
-
- p = Cmd_Args();
-
-// remove quotes if present
- if (*p == '"')
- {
- p++;
- p[strlen(p)-1] = 0;
+ if (!fromServer)
+ sprintf (text, "%s: ", host_client->name);
+ else
+ sprintf (text, "<%s> ", hostname.string);
+
+ p1 = Cmd_Args();
+ p2 = p1 + strlen(p1);
+ // remove the target name
+ while (p1 < p2 && *p1 != ' ')
+ p1++;
+ while (p1 < p2 && *p1 == ' ')
+ p1++;
+ // remove trailing newlines
+ while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+ p2--;
+ // remove quotes if present
+ if (*p1 == '"')
+ {
+ p1++;
+ if (p2[-1] == '"')
+ p2--;
+ else
+ Con_Printf("Host_Say: missing end quote\n");
}
-
-// check length & truncate if necessary
- j = sizeof(text) - 2 - strlen(text); // -2 for /n and null terminator
- if (strlen(p) > j)
- p[j] = 0;
-
- strcat (text, p);
- strcat (text, "\n");
+ while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
+ p2--;
+ for (j = strlen(text);j < (sizeof(text) - 2) && p1 < p2;)
+ text[j++] = *p1++;
+ text[j++] = '\n';
+ text[j++] = 0;
save = host_client;
for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++)
int playercolor;
dfunction_t *f;
func_t SV_ChangeTeam;
-
+
if (Cmd_Argc() == 1)
{
Con_Printf ("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
- Con_Printf ("color <0-13> [0-13]\n");
+ Con_Printf ("color <0-15> [0-15]\n");
return;
}
top = atoi(Cmd_Argv(1));
bottom = atoi(Cmd_Argv(2));
}
-
+
top &= 15;
// LordHavoc: allow skin colormaps 14 and 15 (was 13)
if (top > 15)
// LordHavoc: allow skin colormaps 14 and 15 (was 13)
if (bottom > 15)
bottom = 15;
-
+
playercolor = top*16 + bottom;
if (cmd_source == src_command)
return;
}
- // void(float color) SV_ChangeTeam;
if ((f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
{
Con_DPrintf("Calling SV_ChangeTeam\n");
pr_global_struct->time = sv.time;
- pr_globals[0] = playercolor;
+ pr_globals[OFS_PARM0] = playercolor;
pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
PR_ExecuteProgram (SV_ChangeTeam, "");
}
SV_ClientPrintf ("Can't suicide -- already dead!\n");
return;
}
-
+
pr_global_struct->time = sv.time;
pr_global_struct->self = EDICT_TO_PROG(sv_player);
PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing");
// run the entrance script
if (sv.loadgame)
- { // loaded games are fully inited already
+ {
+ // loaded games are fully initialized already
// if this is the last client to be connected, unpause
sv.paused = false;
MSG_WriteByte (&host_client->message, i);
MSG_WriteByte (&host_client->message, client->colors);
}
-
+
// send all current light styles
for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
{
MSG_WriteByte (&host_client->message, STAT_MONSTERS);
MSG_WriteLong (&host_client->message, pr_global_struct->killed_monsters);
-//
// send a fixangle
// Never send a roll angle, because savegames can catch the server
// in a state where it is expecting the client to correct the angle
*/
void Host_Kick_f (void)
{
- char *who;
- char *message = NULL;
- client_t *save;
- int i;
- qboolean byNumber = false;
+ char *who;
+ const char *message = NULL;
+ client_t *save;
+ int i;
+ qboolean byNumber = false;
if (cmd_source == src_command)
{
if (i < svs.maxclients)
{
if (cmd_source == src_command)
+ {
if (cls.state == ca_dedicated)
who = "Console";
else
who = cl_name.string;
+ }
else
who = save->name;
if (Cmd_Argc() > 2)
{
- message = COM_Parse(Cmd_Args());
+ message = Cmd_Args();
+ COM_ParseToken(&message);
if (byNumber)
{
message++; // skip the #
*/
void Host_Give_f (void)
{
- char *t;
- int v;
- eval_t *val;
+ const char *t;
+ int v;
+ eval_t *val;
if (cmd_source == src_command)
{
Cmd_AddCommand ("viewnext", Host_Viewnext_f);
Cmd_AddCommand ("viewprev", Host_Viewprev_f);
}
+
projects / xonotic / darkplaces.git / blobdiff