char sv_spawnmap[MAX_QPATH];
char sv_loadgame[MAX_OSPATH];
-dfunction_t *ED_FindFunction (char *name);
+mfunction_t *ED_FindFunction (char *name);
/*
==================
void Host_Status_f (void)
{
client_t *client;
- int seconds, minutes, hours = 0, j;
+ 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)
{
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;
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;
return;
}
- if (pr_global_struct->deathmatch)
+ if (pr_global_struct->deathmatch || !sv_player)
return;
if (sv_player->v->movetype != MOVETYPE_NOCLIP)
return;
}
- if (pr_global_struct->deathmatch)
+ if (pr_global_struct->deathmatch || !sv_player)
return;
if (sv_player->v->movetype != MOVETYPE_FLY)
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));
*/
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];
}
}
- 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");
}
return;
}
- sprintf (sv_loadgame, "%s/%s", com_gamedir, Cmd_Argv(1));
- COM_DefaultExtension (sv_loadgame, ".sav");
+ 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 *f;
+ qfile_t *f;
char mapname[MAX_QPATH];
float time, tfloat;
char buf[32768];
cls.demonum = -1; // stop demo loop in case this fails
- 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);
+ str = FS_Getline (f);
for (i = 0;i < NUM_SPAWN_PARMS;i++)
{
- str = Qgetline (f);
+ 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)
{
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
// -1 is the globals
entnum = -1;
- while (!Qeof(f))
+ while (!FS_Eof (f))
{
for (i = 0;i < (int)sizeof(buf) - 1;i++)
{
- r = Qgetc (f);
+ r = FS_Getc (f);
if (r == EOF || !r)
break;
buf[i] = r;
Host_Error ("Loadgame buffer overflow");
buf[i] = 0;
start = buf;
- if (!COM_ParseToken(&start))
+ if (!COM_ParseToken(&start, false))
{
// end of file
break;
else
{
// 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;
+ ent->e->free = false;
ED_ParseEdict (start, ent);
// link it into the bsp tree
- if (!ent->free)
+ if (!ent->e->free)
SV_LinkEdict (ent, false);
}
sv.num_edicts = entnum;
sv.time = time;
- Qclose (f);
+ FS_Close (f);
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)
{
}
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 = 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 - svs.clients);
+ 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 && 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;
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++)
+ 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)
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;
pr_globals[OFS_PARM0] = playercolor;
- pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
+ 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");
}
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_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;
+}
+
//===========================================================================
*/
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 initialized already
}
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 = PR_SetString(host_client->name);
- 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);
{
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 (Cmd_Argc() > 2)
{
message = Cmd_Args();
- COM_ParseToken(&message);
+ 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;
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;
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;
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;
Host_PerformLoadGame(sv_loadgame);
else if (sv_spawnmap[0])
SV_SpawnServer(sv_spawnmap);
- if (sv.active && cls.state == ca_disconnected)
- Cmd_ExecuteString ("connect local", src_command);
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