This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
#include "quakedef.h"
-int current_skill;
+int current_skill;
+char sv_spawnmap[MAX_QPATH];
+char sv_loadgame[MAX_OSPATH];
-dfunction_t *ED_FindFunction (char *name);
+mfunction_t *ED_FindFunction (char *name);
/*
==================
==================
*/
-// 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, players;
+ void (*print) (const char *fmt, ...);
if (cmd_source == src_command)
{
else
print = SV_ClientPrintf;
+ 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);
- if (tcpipAvailable)
- print ("tcp/ip: %s\n", my_tcpip_address);
- if (ipxAvailable)
- print ("ipx: %s\n", my_ipx_address);
print ("map: %s\n", sv.name);
- print ("players: %i active (%i max)\n\n", net_activeconnections, svs.maxclients);
+ 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)(net_time - client->netconnection->connecttime);
+ seconds = (int)(realtime - client->netconnection->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 ("#%-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);
}
}
return;
}
- if (pr_global_struct->deathmatch)
+ if (pr_global_struct->deathmatch || !sv_player)
return;
- sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE;
- if (!((int)sv_player->v.flags & FL_GODMODE) )
+ sv_player->v->flags = (int)sv_player->v->flags ^ FL_GODMODE;
+ if (!((int)sv_player->v->flags & FL_GODMODE) )
SV_ClientPrintf ("godmode OFF\n");
else
SV_ClientPrintf ("godmode ON\n");
return;
}
- if (pr_global_struct->deathmatch)
+ if (pr_global_struct->deathmatch || !sv_player)
return;
- sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET;
- if (!((int)sv_player->v.flags & FL_NOTARGET) )
+ sv_player->v->flags = (int)sv_player->v->flags ^ FL_NOTARGET;
+ if (!((int)sv_player->v->flags & FL_NOTARGET) )
SV_ClientPrintf ("notarget OFF\n");
else
SV_ClientPrintf ("notarget ON\n");
return;
}
- if (pr_global_struct->deathmatch)
+ if (pr_global_struct->deathmatch || !sv_player)
return;
- if (sv_player->v.movetype != MOVETYPE_NOCLIP)
+ if (sv_player->v->movetype != MOVETYPE_NOCLIP)
{
noclip_anglehack = true;
- sv_player->v.movetype = MOVETYPE_NOCLIP;
+ sv_player->v->movetype = MOVETYPE_NOCLIP;
SV_ClientPrintf ("noclip ON\n");
}
else
{
noclip_anglehack = false;
- sv_player->v.movetype = MOVETYPE_WALK;
+ sv_player->v->movetype = MOVETYPE_WALK;
SV_ClientPrintf ("noclip OFF\n");
}
}
return;
}
- if (pr_global_struct->deathmatch)
+ if (pr_global_struct->deathmatch || !sv_player)
return;
- if (sv_player->v.movetype != MOVETYPE_FLY)
+ if (sv_player->v->movetype != MOVETYPE_FLY)
{
- sv_player->v.movetype = MOVETYPE_FLY;
+ sv_player->v->movetype = MOVETYPE_FLY;
SV_ClientPrintf ("flymode ON\n");
}
else
{
- sv_player->v.movetype = MOVETYPE_WALK;
+ sv_player->v->movetype = MOVETYPE_WALK;
SV_ClientPrintf ("flymode OFF\n");
}
}
int i, j;
float total;
client_t *client;
-
+
if (cmd_source == src_command)
{
Cmd_ForwardToServer ();
===============================================================================
*/
-
/*
======================
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];
-
if (cmd_source != src_command)
return;
cls.demonum = -1; // stop demo loop in case this fails
- SCR_BeginLoadingPlaque ();
-
CL_Disconnect ();
- Host_ShutdownServer(false);
+ Host_ShutdownServer(false);
key_dest = key_game; // remove console or menu
+ SCR_BeginLoadingPlaque ();
- cls.mapstring[0] = 0;
- for (i=0 ; i<Cmd_Argc() ; i++)
- {
- strcat (cls.mapstring, Cmd_Argv(i));
- strcat (cls.mapstring, " ");
- }
- strcat (cls.mapstring, "\n");
svs.serverflags = 0; // haven't completed an episode yet
- strcpy (name, Cmd_Argv(1));
- 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);
- }
+ strcpy (sv_spawnmap, Cmd_Argv(1));
}
/*
*/
void Host_Changelevel_f (void)
{
- char level[MAX_QPATH];
-
if (Cmd_Argc() != 2)
{
Con_Printf ("changelevel <levelname> : continue game on a new level\n");
return;
}
SV_SaveSpawnparms ();
- strcpy (level, Cmd_Argv(1));
- SV_SpawnServer (level);
+ strcpy (sv_spawnmap, Cmd_Argv(1));
}
/*
*/
void Host_Restart_f (void)
{
- char mapname[MAX_QPATH];
-
if (cls.demoplayback || !sv.active)
return;
if (cmd_source != src_command)
return;
- strcpy (mapname, sv.name); // must copy out, because it gets cleared
- // in sv_spawnserver
- SV_SpawnServer (mapname);
+ strcpy (sv_spawnmap, sv.name);
}
/*
*/
void Host_Reconnect_f (void)
{
- SCR_BeginLoadingPlaque ();
+ SCR_BeginLoadingPlaque();
cls.signon = 0; // need new connection messages
}
*/
void Host_Connect_f (void)
{
- char name[MAX_QPATH];
-
- cls.demonum = -1; // stop demo loop in case this fails
- if (cls.demoplayback)
- CL_Disconnect ();
- strcpy (name, Cmd_Argv(1));
- CL_EstablishConnection (name);
- Host_Reconnect_f ();
+ CL_EstablishConnection(Cmd_Argv(1));
}
void Host_Savegame_f (void)
{
char name[256];
- QFile *f;
+ qfile_t *f;
int i;
char comment[SAVEGAME_COMMENT_LENGTH+1];
for (i=0 ; i<svs.maxclients ; i++)
{
- if (svs.clients[i].active && (svs.clients[i].edict->v.health <= 0) )
+ if (svs.clients[i].active && (svs.clients[i].edict->v->health <= 0) )
{
Con_Printf ("Can't savegame with a dead player\n");
return;
}
}
- sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
- COM_DefaultExtension (name, ".sav");
+ strncpy (name, Cmd_Argv(1), sizeof (name) - 1);
+ name[sizeof (name) - 1] = '\0';
+ FS_DefaultExtension (name, ".sav");
Con_Printf ("Saving game to %s...\n", name);
- f = Qopen (name, "w");
+ f = FS_Open (name, "w", false);
if (!f)
{
Con_Printf ("ERROR: couldn't open.\n");
return;
}
- Qprintf (f, "%i\n", SAVEGAME_VERSION);
+ FS_Printf (f, "%i\n", SAVEGAME_VERSION);
Host_SavegameComment (comment);
- Qprintf (f, "%s\n", comment);
+ FS_Printf (f, "%s\n", comment);
for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
- Qprintf (f, "%f\n", svs.clients->spawn_parms[i]);
- Qprintf (f, "%d\n", current_skill);
- Qprintf (f, "%s\n", sv.name);
- Qprintf (f, "%f\n",sv.time);
+ FS_Printf (f, "%f\n", svs.clients->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])
- Qprintf (f, "%s\n", sv.lightstyles[i]);
+ FS_Printf (f, "%s\n", sv.lightstyles[i]);
else
- Qprintf (f,"m\n");
+ FS_Printf (f,"m\n");
}
for (i=0 ; i<sv.num_edicts ; i++)
{
ED_Write (f, EDICT_NUM(i));
- Qflush (f);
+ FS_Flush (f);
}
- Qclose (f);
+ FS_Close (f);
Con_Printf ("done.\n");
}
*/
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];
-
if (cmd_source != src_command)
return;
return;
}
- cls.demonum = -1; // stop demo loop in case this fails
+ strcpy (sv_loadgame, Cmd_Argv(1));
+ FS_DefaultExtension (sv_loadgame, ".sav");
+
+ Con_Printf ("Loading game from %s...\n", sv_loadgame);
+}
+
+void Host_PerformLoadGame(char *name)
+{
+ qfile_t *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];
- sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
- COM_DefaultExtension (name, ".sav");
+ cls.demonum = -1; // stop demo loop in case this fails
- Con_Printf ("Loading game from %s...\n", name);
- f = Qopen (name, "rz");
+ f = FS_Open (name, "r", false);
if (!f)
{
Con_Printf ("ERROR: couldn't open.\n");
return;
}
- str = Qgetline (f);
+ str = FS_Getline (f);
sscanf (str, "%i\n", &version);
if (version != SAVEGAME_VERSION)
{
- Qclose (f);
+ FS_Close (f);
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);
+ str = FS_Getline (f);
+ for (i = 0;i < NUM_SPAWN_PARMS;i++)
+ {
+ str = FS_Getline (f);
sscanf (str, "%f\n", &spawn_parms[i]);
}
// this silliness is so we can load 1.06 save files, which have float skill values
- str = Qgetline (f);
+ str = FS_Getline (f);
sscanf (str, "%f\n", &tfloat);
current_skill = (int)(tfloat + 0.1);
Cvar_SetValue ("skill", (float)current_skill);
- strcpy (mapname, Qgetline (f));
+ strcpy (mapname, FS_Getline (f));
- str = Qgetline (f);
+ str = FS_Getline (f);
sscanf (str, "%f\n",&time);
- CL_Disconnect_f ();
-
SV_SpawnServer (mapname);
if (!sv.active)
{
// load the light styles
- for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
+ for (i = 0;i < MAX_LIGHTSTYLES;i++)
{
- str = Qgetline (f);
+ str = FS_Getline (f);
sv.lightstyles[i] = Mem_Alloc(edictstring_mempool, strlen(str)+1);
strcpy (sv.lightstyles[i], str);
}
// load the edicts out of the savegame file
- entnum = -1; // -1 is the globals
- while (!Qeof(f))
+ // -1 is the globals
+ entnum = -1;
+ while (!FS_Eof (f))
{
- for (i=0 ; i<sizeof(buf)-1 ; i++)
+ for (i = 0;i < (int)sizeof(buf) - 1;i++)
{
- r = Qgetc (f);
+ r = FS_Getc (f);
if (r == EOF || !r)
break;
buf[i] = r;
}
}
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, false))
+ {
+ // 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
+ if (entnum >= MAX_EDICTS)
+ Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)\n", MAX_EDICTS);
+ while (entnum >= sv.max_edicts)
+ SV_IncreaseEdicts();
ent = EDICT_NUM(entnum);
- memset (&ent->v, 0, progs->entityfields * 4);
- ent->free = false;
+ memset (ent->v, 0, progs->entityfields * 4);
+ ent->e->free = false;
ED_ParseEdict (start, ent);
-
- // link it into the bsp tree
- if (!ent->free)
+
+ // link it into the bsp tree
+ if (!ent->e->free)
SV_LinkEdict (ent, false);
}
entnum++;
}
-
+
sv.num_edicts = entnum;
sv.time = time;
- Qclose (f);
+ FS_Close (f);
- for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
+ for (i = 0;i < NUM_SPAWN_PARMS;i++)
svs.clients->spawn_parms[i] = spawn_parms[i];
- if (cls.state != ca_dedicated)
- {
- CL_EstablishConnection ("local");
- Host_Reconnect_f ();
- }
+ // 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");
}
//============================================================================
Host_Name_f
======================
*/
+cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"};
void Host_Name_f (void)
{
- char newName[64];
+ char newName[sizeof(host_client->name)];
if (Cmd_Argc () == 1)
{
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);
+ strncpy(newName, Cmd_Argv(1), sizeof(host_client->name) - 1);
else
- strncpy(newName, Cmd_Args(), 15);
- newName[15] = 0;
+ strncpy(newName, Cmd_Args(), sizeof(host_client->name) - 1);
+ newName[sizeof(host_client->name) - 1] = 0;
if (cmd_source == src_command)
{
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);
- host_client->edict->v.netname = host_client->name - pr_strings;
-
+ 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 - svs.clients);
+ MSG_WriteString(&sv.reliable_datagram, host_client->name);
}
-
+
void Host_Version_f (void)
{
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)
{
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;
-
- strcat (text, p);
- strcat (text, "\n");
-
- 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);
- }
+ 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 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--;
+ for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
+ text[j++] = *p1++;
+ 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))
+ 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;
- 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 if (fromServer)
+ Con_Printf("Host_Tell: missing end quote\n");
+ else
+ SV_ClientPrintf("Host_Tell: 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 < (int)(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++)
+ for (j = 0, host_client = svs.clients; j < svs.maxclients; j++, host_client++)
{
- if (!client->active || !client->spawned)
- continue;
- if (Q_strcasecmp(client->name, Cmd_Argv(1)))
- continue;
- host_client = client;
- SV_ClientPrintf("%s", text);
- break;
+ if (host_client->active && host_client->spawned && !strcasecmp(host_client->name, Cmd_Argv(1)))
+ {
+ SV_ClientPrintf("%s", text);
+ break;
+ }
}
host_client = save;
}
Host_Color_f
==================
*/
+cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0"};
void Host_Color_f(void)
{
int top, bottom;
int playercolor;
- dfunction_t *f;
+ mfunction_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)))
+ 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;
- pr_globals[0] = playercolor;
- pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+ pr_globals[OFS_PARM0] = playercolor;
+ pr_global_struct->self = EDICT_TO_PROG(sv_player);
PR_ExecuteProgram (SV_ChangeTeam, "");
}
else
{
+ eval_t *val;
+ 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->edict->v.team = bottom + 1;
+ host_client->old_colors = playercolor;
// send notification to all clients
MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
return;
}
- if (sv_player->v.health <= 0)
+ if (!sv_player || sv_player->v->health <= 0)
{
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_global_struct->self = EDICT_TO_PROG(host_client->edict);
PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing");
}
*/
void Host_Pause_f (void)
{
-
+
if (cmd_source == src_command)
{
Cmd_ForwardToServer ();
else
{
sv.paused ^= 1;
-
- if (sv.paused)
- {
- SV_BroadcastPrintf ("%s paused the game\n", pr_strings + sv_player->v.netname);
- }
- else
- {
- SV_BroadcastPrintf ("%s unpaused the game\n",pr_strings + 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_PModel_f
+LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
+======================
+*/
+cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"};
+static void Host_PModel_f (void)
+{
+ int i;
+ eval_t *val;
+
+ if (Cmd_Argc () == 1)
+ {
+ Con_Printf ("\"pmodel\" is \"%s\"\n", cl_pmodel.string);
+ return;
+ }
+ i = atoi(Cmd_Argv(1));
+
+ if (cmd_source == src_command)
+ {
+ if (cl_pmodel.integer == i)
+ return;
+ Cvar_SetValue ("_cl_pmodel", i);
+ if (cls.state == ca_connected)
+ Cmd_ForwardToServer ();
+ return;
+ }
+
+ host_client->pmodel = i;
+ if (sv_player && (val = GETEDICTFIELDVALUE(sv_player, eval_pmodel)))
+ val->_float = i;
+}
+
//===========================================================================
Con_Printf ("prespawn not valid -- already spawned\n");
return;
}
-
+
SZ_Write (&host_client->message, sv.signon.data, sv.signon.cursize);
MSG_WriteByte (&host_client->message, svc_signonnum);
MSG_WriteByte (&host_client->message, 2);
*/
void Host_Spawn_f (void)
{
- int i;
- client_t *client;
- edict_t *ent;
+ int i;
+ client_t *client;
func_t RestoreGame;
- dfunction_t *f;
+ 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;
}
// LordHavoc: moved this above the QC calls at FrikaC's request
-// send all current names, colors, and frag counts
+ // send all current names, colors, and frag counts
SZ_Clear (&host_client->message);
-// run the entrance script
+ // 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;
}
else
{
- eval_t *val;
// set up the edict
- ent = host_client->edict;
+ ED_ClearEdict(sv_player);
- memset (&ent->v, 0, progs->entityfields * 4);
- ent->v.colormap = NUM_FOR_EDICT(ent);
- ent->v.team = (host_client->colors & 15) + 1;
- ent->v.netname = host_client->name - pr_strings;
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
- val->_float = host_client->pmodel;
+ //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];
// call the spawn function
-
pr_global_struct->time = sv.time;
pr_global_struct->self = EDICT_TO_PROG(sv_player);
PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing");
}
-// send time of update
+ // send time of update
MSG_WriteByte (&host_client->message, svc_time);
MSG_WriteFloat (&host_client->message, sv.time);
{
MSG_WriteByte (&host_client->message, svc_updatename);
MSG_WriteByte (&host_client->message, i);
- MSG_WriteString (&host_client->message, client->name);
+ MSG_WriteString (&host_client->message, client->old_name);
MSG_WriteByte (&host_client->message, svc_updatefrags);
MSG_WriteByte (&host_client->message, i);
MSG_WriteShort (&host_client->message, client->old_frags);
MSG_WriteByte (&host_client->message, svc_updatecolors);
MSG_WriteByte (&host_client->message, i);
- MSG_WriteByte (&host_client->message, client->colors);
+ MSG_WriteByte (&host_client->message, client->old_colors);
}
-
-// send all current light styles
+
+ // send all current light styles
for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
{
MSG_WriteByte (&host_client->message, svc_lightstyle);
MSG_WriteString (&host_client->message, sv.lightstyles[i]);
}
-//
-// send some stats
-//
+ // send some stats
MSG_WriteByte (&host_client->message, svc_updatestat);
MSG_WriteByte (&host_client->message, STAT_TOTALSECRETS);
MSG_WriteLong (&host_client->message, pr_global_struct->total_secrets);
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
-// and it won't happen if the game was just loaded, so you wind up
-// with a permanent head tilt
- ent = EDICT_NUM( 1 + (host_client - svs.clients) );
+ // 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
+ // 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, 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);
*/
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 (!host_client->active)
continue;
- if (Q_strcasecmp(host_client->name, Cmd_Argv(1)) == 0)
+ if (strcasecmp(host_client->name, Cmd_Argv(1)) == 0)
break;
}
}
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, false);
if (byNumber)
{
message++; // skip the #
SV_ClientPrintf ("Kicked by %s: %s\n", who, message);
else
SV_ClientPrintf ("Kicked by %s\n", who);
- SV_DropClient (false);
+ SV_DropClient (false); // kicked
}
host_client = save;
*/
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)
{
return;
}
- if (pr_global_struct->deathmatch)
+ if (pr_global_struct->deathmatch || !sv_player)
return;
t = Cmd_Argv(1);
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;
+ sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON;
else if (t[0] == '0')
- sv_player->v.items = (int)sv_player->v.items | HIT_MJOLNIR;
+ sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR;
else if (t[0] >= '2')
- sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2'));
+ sv_player->v->items = (int)sv_player->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'));
+ sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2'));
}
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;
+ sv_player->v->ammo_shells = v;
break;
case 'n':
if (gamemode == GAME_ROGUE)
if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1)))
{
val->_float = v;
- if (sv_player->v.weapon <= IT_LIGHTNING)
- sv_player->v.ammo_nails = v;
+ if (sv_player->v->weapon <= IT_LIGHTNING)
+ sv_player->v->ammo_nails = v;
}
}
else
{
- sv_player->v.ammo_nails = v;
+ sv_player->v->ammo_nails = v;
}
break;
case 'l':
if (val)
{
val->_float = v;
- if (sv_player->v.weapon > IT_LIGHTNING)
- sv_player->v.ammo_nails = v;
+ if (sv_player->v->weapon > IT_LIGHTNING)
+ sv_player->v->ammo_nails = v;
}
}
break;
if (val)
{
val->_float = v;
- if (sv_player->v.weapon <= IT_LIGHTNING)
- sv_player->v.ammo_rockets = v;
+ if (sv_player->v->weapon <= IT_LIGHTNING)
+ sv_player->v->ammo_rockets = v;
}
}
else
{
- sv_player->v.ammo_rockets = v;
+ sv_player->v->ammo_rockets = v;
}
break;
case 'm':
if (val)
{
val->_float = v;
- if (sv_player->v.weapon > IT_LIGHTNING)
- sv_player->v.ammo_rockets = v;
+ if (sv_player->v->weapon > IT_LIGHTNING)
+ sv_player->v->ammo_rockets = v;
}
}
break;
case 'h':
- sv_player->v.health = v;
+ sv_player->v->health = v;
break;
case 'c':
if (gamemode == GAME_ROGUE)
if (val)
{
val->_float = v;
- if (sv_player->v.weapon <= IT_LIGHTNING)
- sv_player->v.ammo_cells = v;
+ if (sv_player->v->weapon <= IT_LIGHTNING)
+ sv_player->v->ammo_cells = v;
}
}
else
{
- sv_player->v.ammo_cells = v;
+ sv_player->v->ammo_cells = v;
}
break;
case 'p':
if (val)
{
val->_float = v;
- if (sv_player->v.weapon > IT_LIGHTNING)
- sv_player->v.ammo_cells = v;
+ if (sv_player->v->weapon > IT_LIGHTNING)
+ sv_player->v->ammo_cells = v;
}
}
break;
for (i=0 ; i<sv.num_edicts ; i++)
{
e = EDICT_NUM(i);
- if ( !strcmp (pr_strings + e->v.classname, "viewthing") )
+ if (!strcmp (PR_GetString(e->v->classname), "viewthing"))
return e;
}
Con_Printf ("No viewthing on map\n");
Con_Printf ("Can't load %s\n", Cmd_Argv(1));
return;
}
-
- e->v.frame = 0;
- cl.model_precache[(int)e->v.modelindex] = m;
+
+ e->v->frame = 0;
+ cl.model_precache[(int)e->v->modelindex] = m;
}
/*
e = FindViewthing ();
if (!e)
return;
- m = cl.model_precache[(int)e->v.modelindex];
+ m = cl.model_precache[(int)e->v->modelindex];
f = atoi(Cmd_Argv(1));
if (f >= m->numframes)
f = m->numframes-1;
- e->v.frame = f;
+ e->v->frame = f;
}
{
edict_t *e;
model_t *m;
-
+
e = FindViewthing ();
if (!e)
return;
- m = cl.model_precache[(int)e->v.modelindex];
+ m = cl.model_precache[(int)e->v->modelindex];
- e->v.frame = e->v.frame + 1;
- if (e->v.frame >= m->numframes)
- e->v.frame = m->numframes - 1;
+ e->v->frame = e->v->frame + 1;
+ if (e->v->frame >= m->numframes)
+ e->v->frame = m->numframes - 1;
- PrintFrameName (m, e->v.frame);
+ PrintFrameName (m, e->v->frame);
}
/*
if (!e)
return;
- m = cl.model_precache[(int)e->v.modelindex];
+ m = cl.model_precache[(int)e->v->modelindex];
- e->v.frame = e->v.frame - 1;
- if (e->v.frame < 0)
- e->v.frame = 0;
+ e->v->frame = e->v->frame - 1;
+ if (e->v->frame < 0)
+ e->v->frame = 0;
- PrintFrameName (m, e->v.frame);
+ PrintFrameName (m, e->v->frame);
}
/*
if (cls.state == ca_dedicated)
{
- if (!sv.active)
- Cbuf_AddText ("map start\n");
+ if (!sv.active && !sv_spawnmap[0])
+ {
+ if (gamemode == GAME_TRANSFUSION)
+ Cbuf_AddText ("map bb1\n");
+ else
+ Cbuf_AddText ("map start\n");
+ }
return;
}
Con_Printf ("Max %i demos in demoloop\n", MAX_DEMOS);
c = MAX_DEMOS;
}
- Con_Printf ("%i demo(s) in loop\n", c);
+ Con_DPrintf ("%i demo(s) in loop\n", c);
for (i=1 ; i<c+1 ; i++)
strncpy (cls.demos[i-1], Cmd_Argv(i), sizeof(cls.demos[0])-1);
+ // LordHavoc: clear the remaining slots
+ for (;i <= MAX_DEMOS;i++)
+ cls.demos[i-1][0] = 0;
+
if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
{
cls.demonum = 0;
CL_Disconnect ();
}
+// LordHavoc: because we don't want to load things before the video starts,
+// we have to delay map and game loads until AFTER video is initialized
+void Host_PerformSpawnServerAndLoadGame(void)
+{
+ if (vid_hidden && cls.state != ca_dedicated)
+ return;
+ if (sv_loadgame[0])
+ Host_PerformLoadGame(sv_loadgame);
+ else if (sv_spawnmap[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);
+}
+
//=============================================================================
/*
Cmd_AddCommand ("changelevel", Host_Changelevel_f);
Cmd_AddCommand ("connect", Host_Connect_f);
Cmd_AddCommand ("reconnect", Host_Reconnect_f);
- Cmd_AddCommand ("name", Host_Name_f);
Cmd_AddCommand ("version", Host_Version_f);
Cmd_AddCommand ("say", Host_Say_f);
Cmd_AddCommand ("say_team", Host_Say_Team_f);
Cmd_AddCommand ("tell", Host_Tell_f);
- Cmd_AddCommand ("color", Host_Color_f);
Cmd_AddCommand ("kill", Host_Kill_f);
Cmd_AddCommand ("pause", Host_Pause_f);
- Cmd_AddCommand ("spawn", Host_Spawn_f);
- Cmd_AddCommand ("begin", Host_Begin_f);
- Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
Cmd_AddCommand ("kick", Host_Kick_f);
Cmd_AddCommand ("ping", Host_Ping_f);
Cmd_AddCommand ("load", Host_Loadgame_f);
Cmd_AddCommand ("viewframe", Host_Viewframe_f);
Cmd_AddCommand ("viewnext", Host_Viewnext_f);
Cmd_AddCommand ("viewprev", Host_Viewprev_f);
+
+ Cvar_RegisterVariable (&cl_name);
+ Cmd_AddCommand ("name", Host_Name_f);
+ Cvar_RegisterVariable (&cl_color);
+ Cmd_AddCommand ("color", Host_Color_f);
+ if (gamemode == GAME_NEHAHRA)
+ {
+ Cvar_RegisterVariable (&cl_pmodel);
+ Cmd_AddCommand ("pmodel", Host_PModel_f);
+ }
+ Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
+ Cmd_AddCommand ("spawn", Host_Spawn_f);
+ Cmd_AddCommand ("begin", Host_Begin_f);
}
+
projects / xonotic / darkplaces.git / blobdiff