cvar_t sv_cheats = {0, "sv_cheats", "0", "enables cheat commands in any game, and cheat impulses in dpmod"};
cvar_t rcon_password = {0, "rcon_password", "", "password to authenticate rcon commands"};
cvar_t rcon_address = {0, "rcon_address", "", "server address to send rcon commands to (when not connected to a server)"};
+cvar_t team = {CVAR_USERINFO | CVAR_SAVE, "team", "none", "QW team (4 character limit, example: blue)"};
+cvar_t skin = {CVAR_USERINFO | CVAR_SAVE, "skin", "", "QW player skin name (example: base)"};
+cvar_t noaim = {CVAR_USERINFO | CVAR_SAVE, "noaim", "1", "QW option to disable vertical autoaim"};
qboolean allowcheats = false;
/*
CL_Disconnect ();
Host_ShutdownServer();
- // remove console or menu
+ // remove menu
key_dest = key_game;
- key_consoleactive = 0;
svs.serverflags = 0; // haven't completed an episode yet
allowcheats = sv_cheats.integer != 0;
SV_SpawnServer(level);
if (sv.active && cls.state == ca_disconnected)
CL_EstablishConnection("local:1");
+
+// if cl_autodemo is set, automatically start recording a demo if one isn't being recorded already
+ if (cl_autodemo.integer && !cls.demorecording)
+ {
+ char demofile[MAX_OSPATH];
+
+ dpsnprintf (demofile, sizeof(demofile), "%s_%s.dem", Sys_TimeString (cl_autodemo_nameformat.string), level);
+
+ Con_Printf ("Recording to %s.\n", demofile);
+
+ cls.demofile = FS_Open (demofile, "wb", false, false);
+ if (cls.demofile)
+ {
+ cls.forcetrack = -1;
+ FS_Printf (cls.demofile, "%i\n", cls.forcetrack);
+ }
+ else
+ Con_Print ("ERROR: couldn't open.\n");
+
+ cls.demorecording = true;
+ }
}
/*
Con_Print("changelevel <levelname> : continue game on a new level\n");
return;
}
- if (cls.demoplayback)
- {
- Con_Print("Only the server may changelevel\n");
- return;
- }
// HACKHACKHACK
if (!sv.active) {
Host_Map_f();
if (cmd_source != src_command)
return;
- // remove console or menu
+ // remove menu
key_dest = key_game;
- key_consoleactive = 0;
SV_VM_Begin();
SV_SaveSpawnparms ();
if (cmd_source != src_command)
return;
- // remove console or menu
+ // remove menu
key_dest = key_game;
- key_consoleactive = 0;
allowcheats = sv_cheats.integer != 0;
strcpy(mapname, sv.name);
*/
void Host_Reconnect_f (void)
{
- if (cmd_source == src_command)
- {
- Con_Print("reconnect is not valid from the console\n");
- return;
- }
- if (Cmd_Argc() != 1)
+ if (cls.protocol == PROTOCOL_QUAKEWORLD)
{
- Con_Print("reconnect : wait for signon messages again\n");
- return;
+ if (cls.qw_downloadmemory) // don't change when downloading
+ return;
+
+ S_StopAllSounds();
+
+ if (cls.netcon)
+ {
+ if (cls.state == ca_connected && cls.signon < SIGNONS)
+ {
+ Con_Printf("reconnecting...\n");
+ MSG_WriteChar(&cls.netcon->message, qw_clc_stringcmd);
+ MSG_WriteString(&cls.netcon->message, "new");
+ }
+ else
+ {
+ char temp[128];
+ // if we have connected to a server recently, the userinfo
+ // will still contain its IP address, so get the address...
+ InfoString_GetValue(cls.userinfo, "*ip", temp, sizeof(temp));
+ if (temp[0])
+ CL_EstablishConnection(temp);
+ else
+ Con_Printf("Reconnect to what server? (you have not connected to a server yet)\n");
+ }
+ }
}
- if (!cls.signon)
+ else
{
- //Con_Print("reconnect: no signon, ignoring reconnect\n");
- return;
+ 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;
+ }
+ cls.signon = 0; // need new connection messages
}
- cls.signon = 0; // need new connection messages
}
/*
entnum++;
}
+ Mem_Free(text);
prog->num_edicts = entnum;
sv.time = time;
if (cmd_source == src_command)
{
Cvar_Set ("_cl_name", newName);
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "name", newName);
- if (cls.state == ca_connected)
- Cmd_ForwardToServer ();
+ CL_SetInfo("name", newName, true, false, false, false);
return;
}
if (cmd_source == src_command)
{
Cvar_Set ("_cl_playermodel", newPath);
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "playermodel", newPath);
- if (cls.state == ca_connected)
- Cmd_ForwardToServer ();
+ CL_SetInfo("playermodel", newPath, true, false, false, false);
return;
}
if (cmd_source == src_command)
{
Cvar_Set ("_cl_playerskin", newPath);
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "playerskin", newPath);
- if (cls.state == ca_connected)
- Cmd_ForwardToServer ();
+ CL_SetInfo("playermodel", newPath, true, false, false, false);
return;
}
if (!teamplay.integer)
teamonly = false;
-// turn on color set 1
p1 = Cmd_Args();
quoted = false;
if (*p1 == '\"')
quoted = true;
p1++;
}
+ // note this uses the chat prefix \001
if (!fromServer)
- dpsnprintf (text, sizeof(text), "%c%s" STRING_COLOR_DEFAULT_STR ": %s", 1, host_client->name, p1);
+ dpsnprintf (text, sizeof(text), "\001%s" STRING_COLOR_DEFAULT_STR ": %s", host_client->name, p1);
else
- dpsnprintf (text, sizeof(text), "%c<%s" STRING_COLOR_DEFAULT_STR "> %s", 1, hostname.string, p1);
+ dpsnprintf (text, sizeof(text), "\001<%s" STRING_COLOR_DEFAULT_STR "> %s", hostname.string, p1);
p2 = text + strlen(text);
while ((const char *)p2 > (const char *)text && (p2[-1] == '\r' || p2[-1] == '\n' || (p2[-1] == '\"' && quoted)))
{
if (Cmd_Argc () < 3)
return;
+ // note this uses the chat prefix \001
if (!fromServer)
- sprintf (text, "%s: ", host_client->name);
+ sprintf (text, "\001%s tells you: ", host_client->name);
else
- sprintf (text, "<%s> ", hostname.string);
+ sprintf (text, "\001<%s tells you> ", hostname.string);
p1 = Cmd_Args();
p2 = p1 + strlen(p1);
==================
*/
cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0", "internal storage cvar for current player colors (changed by color command)"};
-void Host_Color_f(void)
+void Host_Color(int changetop, int changebottom)
{
- int top, bottom;
- int playercolor;
+ int top, bottom, playercolor;
mfunction_t *f;
- func_t SV_ChangeTeam;
+ func_t SV_ChangeTeam;
- if (Cmd_Argc() == 1)
- {
- Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
- Con_Print("color <0-15> [0-15]\n");
- return;
- }
-
- if (Cmd_Argc() == 2)
- top = bottom = atoi(Cmd_Argv(1));
- else
- {
- top = atoi(Cmd_Argv(1));
- bottom = atoi(Cmd_Argv(2));
- }
+ // get top and bottom either from the provided values or the current values
+ // (allows changing only top or bottom, or both at once)
+ top = changetop >= 0 ? changetop : (cl_color.integer >> 4);
+ bottom = changebottom >= 0 ? changebottom : cl_color.integer;
top &= 15;
- // LordHavoc: allow skin colormaps 14 and 15 (was 13)
- if (top > 15)
- top = 15;
bottom &= 15;
- // LordHavoc: allow skin colormaps 14 and 15 (was 13)
- if (bottom > 15)
- bottom = 15;
+ // LordHavoc: allowing skin colormaps 14 and 15 by commenting this out
+ //if (top > 13)
+ // top = 13;
+ //if (bottom > 13)
+ // bottom = 13;
playercolor = top*16 + bottom;
if (cmd_source == src_command)
{
- Cvar_SetValue ("_cl_color", playercolor);
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "topcolor", va("%i", top));
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "bottomcolor", va("%i", bottom));
- if (cls.state == ca_connected && cls.protocol != PROTOCOL_QUAKEWORLD)
- Cmd_ForwardToServer ();
+ Cvar_SetValueQuick(&cl_color, playercolor);
+ if (changetop >= 0)
+ CL_SetInfo("topcolor", va("%i", top), true, false, false, false);
+ if (changebottom >= 0)
+ CL_SetInfo("bottomcolor", va("%i", bottom), true, false, false, false);
+ if (cls.protocol != PROTOCOL_QUAKEWORLD)
+ {
+ MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+ MSG_WriteString(&cls.netcon->message, va("color %i %i", top, bottom));
+ }
return;
}
}
}
+void Host_Color_f(void)
+{
+ int top, bottom;
+
+ if (Cmd_Argc() == 1)
+ {
+ Con_Printf("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15);
+ Con_Print("color <0-15> [0-15]\n");
+ return;
+ }
+
+ if (Cmd_Argc() == 2)
+ top = bottom = atoi(Cmd_Argv(1));
+ else
+ {
+ top = atoi(Cmd_Argv(1));
+ bottom = atoi(Cmd_Argv(2));
+ }
+ Host_Color(top, bottom);
+}
+
+void Host_TopColor_f(void)
+{
+ if (Cmd_Argc() == 1)
+ {
+ Con_Printf("\"topcolor\" is \"%i\"\n", cl_color.integer >> 4);
+ Con_Print("topcolor <0-15>\n");
+ return;
+ }
+
+ Host_Color(atoi(Cmd_Argv(1)), -1);
+}
+
+void Host_BottomColor_f(void)
+{
+ if (Cmd_Argc() == 1)
+ {
+ Con_Printf("\"bottomcolor\" is \"%i\"\n", cl_color.integer);
+ Con_Print("bottomcolor <0-15>\n");
+ return;
+ }
+
+ Host_Color(-1, atoi(Cmd_Argv(1)));
+}
+
cvar_t cl_rate = {CVAR_SAVE, "_cl_rate", "10000", "internal storage cvar for current rate (changed by rate command)"};
void Host_Rate_f(void)
{
if (cmd_source == src_command)
{
Cvar_SetValue ("_cl_rate", bound(NET_MINRATE, rate, NET_MAXRATE));
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "rate", va("%i", rate));
- if (cls.state == ca_connected)
- Cmd_ForwardToServer ();
+ CL_SetInfo("rate", va("%i", rate), true, false, false, false);
return;
}
// send some stats
MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALSECRETS);
- MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->total_secrets);
+ MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_secrets);
MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
MSG_WriteByte (&host_client->netconnection->message, STAT_TOTALMONSTERS);
- MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->total_monsters);
+ MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->total_monsters);
MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
MSG_WriteByte (&host_client->netconnection->message, STAT_SECRETS);
- MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->found_secrets);
+ MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->found_secrets);
MSG_WriteByte (&host_client->netconnection->message, svc_updatestat);
MSG_WriteByte (&host_client->netconnection->message, STAT_MONSTERS);
- MSG_WriteLong (&host_client->netconnection->message, prog->globals.server->killed_monsters);
+ MSG_WriteLong (&host_client->netconnection->message, (int)prog->globals.server->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
- MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
- MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[0], sv.protocol);
- MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[1], sv.protocol);
- MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+ if (sv.loadgame)
+ {
+ MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
+ MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->v_angle[0], sv.protocol);
+ MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->v_angle[1], sv.protocol);
+ MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+ sv.loadgame = false; // we're basically done with loading now
+ }
+ else
+ {
+ MSG_WriteByte (&host_client->netconnection->message, svc_setangle);
+ MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[0], sv.protocol);
+ MSG_WriteAngle (&host_client->netconnection->message, host_client->edict->fields.server->angles[1], sv.protocol);
+ MSG_WriteAngle (&host_client->netconnection->message, 0, sv.protocol);
+ }
SV_WriteClientdataToMessage (host_client, host_client->edict, &host_client->netconnection->message, stats);
if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0)
{
- i = atof(Cmd_Argv(2)) - 1;
+ i = (int)(atof(Cmd_Argv(2)) - 1);
if (i < 0 || i >= svs.maxclients || !(host_client = svs.clients + i)->active)
return;
byNumber = true;
if (e->fields.server->frame >= m->numframes)
e->fields.server->frame = m->numframes - 1;
- PrintFrameName (m, e->fields.server->frame);
+ PrintFrameName (m, (int)e->fields.server->frame);
}
/*
if (e->fields.server->frame < 0)
e->fields.server->frame = 0;
- PrintFrameName (m, e->fields.server->frame);
+ PrintFrameName (m, (int)e->fields.server->frame);
}
/*
// QuakeWorld commands
-char emodel_name[] =
- { 'e' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
-char pmodel_name[] =
- { 'p' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
-char prespawn_name[] =
- { 'p'^0xff, 'r'^0xff, 'e'^0xff, 's'^0xff, 'p'^0xff, 'a'^0xff, 'w'^0xff, 'n'^0xff,
- ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '0'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-char modellist_name[] =
- { 'm'^0xff, 'o'^0xff, 'd'^0xff, 'e'^0xff, 'l'^0xff, 'l'^0xff, 'i'^0xff, 's'^0xff, 't'^0xff,
- ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-char soundlist_name[] =
- { 's'^0xff, 'o'^0xff, 'u'^0xff, 'n'^0xff, 'd'^0xff, 'l'^0xff, 'i'^0xff, 's'^0xff, 't'^0xff,
- ' '^0xff, '%'^0xff, 'i'^0xff, ' '^0xff, '%'^0xff, 'i'^0xff, 0 };
-
/*
=====================
Host_Rcon_f
{
if (!cl.scores[i].name[0])
continue;
- if (cl.scores[i].userid == uid || !strcasecmp(cl.scores[i].name, Cmd_Argv(1)))
+ if (cl.scores[i].qw_userid == uid || !strcasecmp(cl.scores[i].name, Cmd_Argv(1)))
{
- InfoString_Print(cl.scores[i].userinfo);
+ InfoString_Print(cl.scores[i].qw_userinfo);
return;
}
}
{
if (cl.scores[i].name[0])
{
- Con_Printf ("%6i %4i %s\n", cl.scores[i].userid, cl.scores[i].frags, cl.scores[i].name);
+ Con_Printf ("%6i %4i %s\n", cl.scores[i].qw_userid, cl.scores[i].frags, cl.scores[i].name);
c++;
}
}
// TODO: shouldn't this be a cvar instead?
void Host_FullServerinfo_f (void) // credit: taken from QuakeWorld
{
+ char temp[512];
if (Cmd_Argc() != 2)
{
Con_Printf ("usage: fullserverinfo <complete info string>\n");
return;
}
- strlcpy (cl.serverinfo, Cmd_Argv(1), sizeof(cl.serverinfo));
+ strlcpy (cl.qw_serverinfo, Cmd_Argv(1), sizeof(cl.qw_serverinfo));
+ InfoString_GetValue(cl.qw_serverinfo, "teamplay", temp, sizeof(temp));
+ cl.qw_teamplay = atoi(temp);
}
/*
if (*s)
s++;
- if (!strcasecmp(key, pmodel_name) || !strcasecmp(key, emodel_name))
- continue;
-
- if (key[0] == '*')
- {
- Con_Printf("Can't set star-key \"%s\" to \"%s\"\n", key, value);
- continue;
- }
-
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), key, value);
+ CL_SetInfo(key, value, false, false, false, false);
}
}
Con_Printf ("usage: setinfo [ <key> <value> ]\n");
return;
}
- if (!strcasecmp(Cmd_Argv(1), pmodel_name) || !strcasecmp(Cmd_Argv(1), emodel_name))
- return;
- if (Cmd_Argv(1)[0] == '*')
- {
- Con_Printf("Can't set star-key \"%s\" to \"%s\"\n", Cmd_Argv(1), Cmd_Argv(2));
- return;
- }
- InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), Cmd_Argv(1), Cmd_Argv(2));
- if (cls.state == ca_connected)
- Cmd_ForwardToServer ();
+ CL_SetInfo(Cmd_Argv(1), Cmd_Argv(2), true, false, false, false);
}
/*
out = send+4;
send[0] = send[1] = send[2] = send[3] = 0xff;
- l = strlen (in);
+ l = (int)strlen (in);
for (i=0 ; i<l ; i++)
{
if (out >= send + sizeof(send) - 1)
*out++ = '\n';
i++;
}
+ else if (in[i] == '\\' && in[i+1] == '0')
+ {
+ *out++ = '\0';
+ i++;
+ }
+ else if (in[i] == '\\' && in[i+1] == 't')
+ {
+ *out++ = '\t';
+ i++;
+ }
+ else if (in[i] == '\\' && in[i+1] == 'r')
+ {
+ *out++ = '\r';
+ i++;
+ }
+ else if (in[i] == '\\' && in[i+1] == '"')
+ {
+ *out++ = '\"';
+ i++;
+ }
else
*out++ = in[i];
}
- *out = 0;
mysocket = NetConn_ChooseClientSocketForAddress(&address);
if (mysocket)
- NetConn_WriteString(mysocket, send, &address);
+ NetConn_Write(mysocket, send, out - send, &address);
}
//=============================================================================
*/
void Host_InitCommands (void)
{
- strcpy(cls.userinfo, "\\name\\player\\team\\none\\topcolor\\0\\bottomcolor\\0\\rate\\10000\\msg\\1\\*ver\\dp");
+ dpsnprintf(cls.userinfo, sizeof(cls.userinfo), "\\name\\player\\team\\none\\topcolor\\0\\bottomcolor\\0\\rate\\10000\\msg\\1\\noaim\\1\\*ver\\%s", engineversion);
Cmd_AddCommand ("status", Host_Status_f, "print server status information");
Cmd_AddCommand ("quit", Host_Quit_f, "quit the game");
Cmd_AddCommand ("fullinfo", Host_FullInfo_f, "allows client to modify their userinfo");
Cmd_AddCommand ("setinfo", Host_SetInfo_f, "modifies your userinfo");
Cmd_AddCommand ("packet", Host_Packet_f, "send a packet to the specified address:port containing a text string");
+ Cmd_AddCommand ("topcolor", Host_TopColor_f, "QW command to set top color without changing bottom color");
+ Cmd_AddCommand ("bottomcolor", Host_BottomColor_f, "QW command to set bottom color without changing top color");
+
+ Cvar_RegisterVariable (&team);
+ Cvar_RegisterVariable (&skin);
+ Cvar_RegisterVariable (&noaim);
Cvar_RegisterVariable(&sv_cheats);
}
projects / xonotic / darkplaces.git / blobdiff