cvar_t cl_sound_ric3 = {0, "cl_sound_ric3", "weapons/ric3.wav", "sound to play with 10% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
cvar_t cl_sound_r_exp3 = {0, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"};
cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"};
-cvar_t cl_joinbeforedownloadsfinish = {0, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
-cvar_t cl_nettimesyncmode = {0, "cl_nettimesyncmode", "2", "selects method of time synchronization in client with regard to server packets, values are: 0 = no sync, 1 = exact sync (reset timing each packet), 2 = loose sync (reset timing only if it is out of bounds), 3 = tight sync and bounding"};
+cvar_t cl_joinbeforedownloadsfinish = {CVAR_SAVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
+cvar_t cl_nettimesyncfactor = {CVAR_SAVE, "cl_nettimesyncfactor", "0", "rate at which client time adapts to match server time, 1 = instantly, 0.125 = slowly, 0 = not at all (bounding still applies)"};
+cvar_t cl_nettimesyncboundmode = {CVAR_SAVE, "cl_nettimesyncboundmode", "5", "method of restricting client time to valid values, 0 = no correction, 1 = tight bounding (jerky with packet loss), 2 = loose bounding (corrects it if out of bounds), 3 = leniant bounding (ignores temporary errors due to varying framerate), 4 = slow adjustment method from Quake3, 5 = slightly nicer version of Quake3 method"};
+cvar_t cl_nettimesyncboundtolerance = {CVAR_SAVE, "cl_nettimesyncboundtolerance", "0.25", "how much error is tolerated by bounding check, as a fraction of frametime, 0.25 = up to 25% margin of error tolerated, 1 = use only new time, 0 = use only old time (same effect as setting cl_nettimesyncfactor to 1)"};
+cvar_t cl_iplog_name = {CVAR_SAVE, "cl_iplog_name", "darkplaces_iplog.txt", "name of iplog file containing player addresses for iplog_list command and automatic ip logging when parsing status command"};
static qboolean QW_CL_CheckOrDownloadFile(const char *filename);
static void QW_CL_RequestNextDownload(void);
msg.data = buf;
msg.maxsize = sizeof(buf);
MSG_WriteChar(&msg, clc_nop);
- NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol);
+ NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000);
}
}
CL_Locs_Reload_f();
R_Modules_NewMap();
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
+
// add pmodel/emodel CRCs to userinfo
CL_SetInfo("pmodel", va("%i", FS_CRCFile("progs/player.mdl", NULL)), true, true, true, true);
CL_SetInfo("emodel", va("%i", FS_CRCFile("progs/eyes.mdl", NULL)), true, true, true, true);
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
// check memory integrity
Mem_CheckSentinelsGlobal();
+
+// if cl_autodemo is set, automatically start recording a demo if one isn't being recorded already
+ if (cl_autodemo.integer && cls.netcon && cls.protocol != PROTOCOL_QUAKEWORLD)
+ {
+ char demofile[MAX_OSPATH];
+ char levelname[MAX_QPATH];
+
+ if (cls.demorecording)
+ {
+ // finish the previous level's demo file
+ CL_Stop_f();
+ }
+
+ // start a new demo file
+ strlcpy(levelname, FS_FileWithoutPath(cl.model_name[1]), sizeof(levelname));
+ if (strrchr(levelname, '.'))
+ *(strrchr(levelname, '.')) = 0;
+ dpsnprintf (demofile, sizeof(demofile), "%s_%s.dem", Sys_TimeString (cl_autodemo_nameformat.string), levelname);
+
+ Con_Printf ("Auto-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);
+ cls.demorecording = true;
+ }
+ else
+ Con_Print ("ERROR: couldn't open.\n");
+ }
}
void CL_ValidateState(entity_state_t *s)
ent->persistent.muzzleflash = 0;
VectorCopy(ent->state_current.origin, ent->persistent.trail_origin);
}
- else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000 || (cl.fixangle[0] && !cl.fixangle[1]))
+ else if (DotProduct(odelta, odelta) > 1000*1000 || (cl.fixangle[0] && !cl.fixangle[1]))
{
// don't interpolate the move
// (the fixangle[] check detects teleports, but not constant fixangles
CL_ParticleEffect(effectindex, count, origin, origin, velocity, velocity, NULL, 0);
}
+typedef struct cl_iplog_item_s
+{
+ char *address;
+ char *name;
+}
+cl_iplog_item_t;
+
+static qboolean cl_iplog_loaded = false;
+static int cl_iplog_numitems = 0;
+static int cl_iplog_maxitems = 0;
+static cl_iplog_item_t *cl_iplog_items;
+
+static void CL_IPLog_Load(void);
+static void CL_IPLog_Add(const char *address, const char *name, qboolean checkexisting, qboolean addtofile)
+{
+ int i;
+ if (!address || !address[0] || !name || !name[0])
+ return;
+ if (!cl_iplog_loaded)
+ CL_IPLog_Load();
+ if (developer.integer >= 100)
+ Con_Printf("CL_IPLog_Add(\"%s\", \"%s\", %i, %i);\n", address, name, checkexisting, addtofile);
+ // see if it already exists
+ if (checkexisting)
+ {
+ for (i = 0;i < cl_iplog_numitems;i++)
+ {
+ if (!strcmp(cl_iplog_items[i].address, address) && !strcmp(cl_iplog_items[i].name, name))
+ {
+ if (developer.integer >= 100)
+ Con_Printf("... found existing \"%s\" \"%s\"\n", cl_iplog_items[i].address, cl_iplog_items[i].name);
+ return;
+ }
+ }
+ }
+ // it does not already exist in the iplog, so add it
+ if (cl_iplog_maxitems <= cl_iplog_numitems || !cl_iplog_items)
+ {
+ cl_iplog_item_t *olditems = cl_iplog_items;
+ cl_iplog_maxitems = max(1024, cl_iplog_maxitems + 256);
+ cl_iplog_items = Mem_Alloc(cls.permanentmempool, cl_iplog_maxitems * sizeof(cl_iplog_item_t));
+ if (olditems)
+ {
+ if (cl_iplog_numitems)
+ memcpy(cl_iplog_items, olditems, cl_iplog_numitems * sizeof(cl_iplog_item_t));
+ Mem_Free(olditems);
+ }
+ }
+ cl_iplog_items[cl_iplog_numitems].address = Mem_Alloc(cls.permanentmempool, strlen(address) + 1);
+ cl_iplog_items[cl_iplog_numitems].name = Mem_Alloc(cls.permanentmempool, strlen(name) + 1);
+ strlcpy(cl_iplog_items[cl_iplog_numitems].address, address, strlen(address) + 1);
+ // TODO: maybe it would be better to strip weird characters from name when
+ // copying it here rather than using a straight strcpy?
+ strlcpy(cl_iplog_items[cl_iplog_numitems].name, name, strlen(name) + 1);
+ cl_iplog_numitems++;
+ if (addtofile)
+ {
+ // add it to the iplog.txt file
+ // TODO: this ought to open the one in the userpath version of the base
+ // gamedir, not the current gamedir
+ Log_Printf(cl_iplog_name.string, "%s %s\n", address, name);
+ if (developer.integer >= 100)
+ Con_Printf("CL_IPLog_Add: appending this line to %s: %s %s\n", cl_iplog_name.string, address, name);
+ }
+}
+
+static void CL_IPLog_Load(void)
+{
+ int i, len, linenumber;
+ char *text, *textend;
+ unsigned char *filedata;
+ fs_offset_t filesize;
+ char line[MAX_INPUTLINE];
+ char address[MAX_INPUTLINE];
+ cl_iplog_loaded = true;
+ // TODO: this ought to open the one in the userpath version of the base
+ // gamedir, not the current gamedir
+ filedata = FS_LoadFile(cl_iplog_name.string, tempmempool, true, &filesize);
+ if (!filedata)
+ return;
+ text = (char *)filedata;
+ textend = text + filesize;
+ for (linenumber = 1;text < textend;linenumber++)
+ {
+ for (len = 0;text < textend && *text != '\r' && *text != '\n';text++)
+ if (len < (int)sizeof(line) - 1)
+ line[len++] = *text;
+ line[len] = 0;
+ if (text < textend && *text == '\r' && text[1] == '\n')
+ text++;
+ if (text < textend && *text == '\n')
+ text++;
+ if (line[0] == '/' && line[1] == '/')
+ continue; // skip comments if anyone happens to add them
+ for (i = 0;i < len && line[i] > ' ';i++)
+ address[i] = line[i];
+ address[i] = 0;
+ // skip exactly one space character
+ i++;
+ // address contains the address with termination,
+ // line + i contains the name with termination
+ if (address[0] && line[i])
+ CL_IPLog_Add(address, line + i, false, false);
+ else
+ Con_Printf("%s:%i: could not parse address and name:\n%s\n", cl_iplog_name.string, linenumber, line);
+ }
+}
+
+static void CL_IPLog_List_f(void)
+{
+ int i, j;
+ const char *addressprefix;
+ if (Cmd_Argc() > 2)
+ {
+ Con_Printf("usage: %s 123.456.789.\n", Cmd_Argv(0));
+ return;
+ }
+ addressprefix = "";
+ if (Cmd_Argc() >= 2)
+ addressprefix = Cmd_Argv(1);
+ if (!cl_iplog_loaded)
+ CL_IPLog_Load();
+ if (addressprefix && addressprefix[0])
+ Con_Printf("Listing iplog addresses beginning with %s\n", addressprefix);
+ else
+ Con_Printf("Listing all iplog entries\n");
+ Con_Printf("address name\n");
+ for (i = 0;i < cl_iplog_numitems;i++)
+ {
+ if (addressprefix && addressprefix[0])
+ {
+ for (j = 0;addressprefix[j];j++)
+ if (addressprefix[j] != cl_iplog_items[i].address[j])
+ break;
+ // if this address does not begin with the addressprefix string
+ // simply omit it from the output
+ if (addressprefix[j])
+ continue;
+ }
+ // if name is less than 15 characters, left justify it and pad
+ // if name is more than 15 characters, print all of it, not worrying
+ // about the fact it will misalign the columns
+ if (strlen(cl_iplog_items[i].address) < 15)
+ Con_Printf("%-15s %s\n", cl_iplog_items[i].address, cl_iplog_items[i].name);
+ else
+ Con_Printf("%5s %s\n", cl_iplog_items[i].address, cl_iplog_items[i].name);
+ }
+}
+
// look for anything interesting like player IP addresses or ping reports
qboolean CL_ExaminePrintString(const char *text)
{
+ int len;
const char *t;
+ char temp[MAX_INPUTLINE];
if (!strcmp(text, "Client ping times:\n"))
{
cl.parsingtextmode = CL_PARSETEXTMODE_PING;
if (text[0] == '#' && text[1] >= '0' && text[1] <= '9')
{
t = text + 1;
- cl.parsingtextplayerindex = atoi(t);
+ cl.parsingtextplayerindex = atoi(t) - 1;
while (*t >= '0' && *t <= '9')
t++;
if (*t == ' ')
cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERIP;
return true;
}
+ // the player name follows here, along with frags and time
}
}
if (cl.parsingtextmode == CL_PARSETEXTMODE_STATUS_PLAYERIP)
t = text;
while (*t == ' ')
t++;
+ for (len = 0;*t && *t != '\n';t++)
+ if (len < (int)sizeof(temp) - 1)
+ temp[len++] = *t;
+ temp[len] = 0;
// botclient is perfectly valid, but we don't care about bots
- if (strcmp(t, "botclient\n"))
+ // also don't try to look up the name of an invalid player index
+ if (strcmp(temp, "botclient")
+ && cl.parsingtextplayerindex >= 0
+ && cl.parsingtextplayerindex < cl.maxclients
+ && cl.scores[cl.parsingtextplayerindex].name[0])
{
- lhnetaddress_t address;
- LHNETADDRESS_FromString(&address, t, 0);
- // TODO: log the IP address and player name?
+ // log the player name and IP address string
+ // (this operates entirely on strings to avoid issues with the
+ // nature of a network address)
+ CL_IPLog_Add(temp, cl.scores[cl.parsingtextplayerindex].name, true, true);
}
cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERID;
return true;
return true;
}
+extern cvar_t slowmo;
static void CL_NetworkTimeReceived(double newtime)
{
- if (cl_nolerp.integer || cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer))
- cl.mtime[1] = cl.mtime[0] = newtime;
+ double timehigh;
+ if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[0] == newtime || cls.signon < SIGNONS)
+ cl.time = cl.mtime[1] = cl.mtime[0] = newtime;
else
{
cl.mtime[1] = max(cl.mtime[0], newtime - 0.1);
cl.mtime[0] = newtime;
+ if (developer.integer >= 100 && vid_activewindow)
+ {
+ if (cl.time < cl.mtime[1] - (cl.mtime[0] - cl.mtime[1]))
+ Con_Printf("--- cl.time < cl.mtime[1] (%f < %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
+ else if (cl.time > cl.mtime[0] + (cl.mtime[0] - cl.mtime[1]))
+ Con_Printf("--- cl.time > cl.mtime[0] (%f > %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
+ }
+ cl.time += (cl.mtime[1] - cl.time) * bound(0, cl_nettimesyncfactor.value, 1);
+ timehigh = cl.mtime[1] + (cl.mtime[0] - cl.mtime[1]) * cl_nettimesyncboundtolerance.value;
+ if (cl_nettimesyncboundmode.integer == 1)
+ cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
+ else if (cl_nettimesyncboundmode.integer == 2)
+ {
+ if (cl.time < cl.mtime[1] || cl.time > timehigh)
+ cl.time = cl.mtime[1];
+ }
+ else if (cl_nettimesyncboundmode.integer == 3)
+ {
+ if ((cl.time < cl.mtime[1] && cl.oldtime < cl.mtime[1]) || (cl.time > timehigh && cl.oldtime > timehigh))
+ cl.time = cl.mtime[1];
+ }
+ else if (cl_nettimesyncboundmode.integer == 4)
+ {
+ if (fabs(cl.time - cl.mtime[1]) > 0.5)
+ cl.time = cl.mtime[1]; // reset
+ else if (fabs(cl.time - cl.mtime[1]) > 0.1)
+ cl.time += 0.5 * (cl.mtime[1] - cl.time); // fast
+ else if (cl.time > cl.mtime[1])
+ cl.time -= 0.002 * slowmo.value; // fall into the past by 2ms
+ else
+ cl.time += 0.001 * slowmo.value; // creep forward 1ms
+ }
+ else if (cl_nettimesyncboundmode.integer == 5)
+ {
+ if (fabs(cl.time - cl.mtime[1]) > 0.5)
+ cl.time = cl.mtime[1]; // reset
+ else if (fabs(cl.time - cl.mtime[1]) > 0.1)
+ cl.time += 0.5 * (cl.mtime[1] - cl.time); // fast
+ else
+ cl.time = bound(cl.time - 0.002 * slowmo.value, cl.mtime[1], cl.time + 0.001 * slowmo.value); // slow adjust
+ }
}
- if (cl_nettimesyncmode.integer == 3)
- cl.time = cl.mtime[1];
- if (cl_nettimesyncmode.integer == 2)
- {
- if (cl.time < cl.mtime[1] || cl.time > cl.mtime[0])
- cl.time = cl.mtime[1];
- }
- else if (cl_nettimesyncmode.integer == 1)
- cl.time = cl.mtime[1];
// this packet probably contains a player entity update, so we will need
// to update the prediction
cl.movement_needupdate = true;
char *cmdlogname[32], *temp;
int cmdindex, cmdcount = 0;
- if (cls.demorecording)
- CL_WriteDemoMessage ();
+ // LordHavoc: moved demo message writing from before the packet parse to
+ // after the packet parse so that CL_Stop_f can be called by cl_autodemo
+ // code in CL_ParseServerinfo
+ //if (cls.demorecording)
+ // CL_WriteDemoMessage (&net_message);
cl.last_received_message = realtime;
{
model_t *model = Mod_ForName(s, false, false, i == 1);
if (!model)
- Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
+ Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
cl.model_precache[i] = model;
}
else
{
sfx_t *sfx = S_PrecacheSound (s, true, false);
if (!sfx && snd_initialized.integer)
- Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
+ Con_DPrintf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
cl.sound_precache[i] = sfx;
}
else
EntityFrameQuake_ISeeDeadEntities();
parsingerror = false;
+
+ // LordHavoc: this was at the start of the function before cl_autodemo was
+ // implemented
+ if (cls.demorecording)
+ CL_WriteDemoMessage (&net_message);
}
void CL_Parse_DumpPacket(void)
// server extension cvars set by commands issued from the server during connect
Cvar_RegisterVariable(&cl_serverextension_download);
- Cvar_RegisterVariable(&cl_nettimesyncmode);
+ Cvar_RegisterVariable(&cl_nettimesyncfactor);
+ Cvar_RegisterVariable(&cl_nettimesyncboundmode);
+ Cvar_RegisterVariable(&cl_nettimesyncboundtolerance);
+ Cvar_RegisterVariable(&cl_iplog_name);
Cmd_AddCommand("nextul", QW_CL_NextUpload, "sends next fragment of current upload buffer (screenshot for example)");
Cmd_AddCommand("stopul", QW_CL_StopUpload, "aborts current upload (screenshot for example)");
Cmd_AddCommand("cl_downloadbegin", CL_DownloadBegin_f, "(networking) informs client of download file information, client replies with sv_startsoundload to begin the transfer");
Cmd_AddCommand("stopdownload", CL_StopDownload_f, "terminates a download");
Cmd_AddCommand("cl_downloadfinished", CL_DownloadFinished_f, "signals that a download has finished and provides the client with file size and crc to check its integrity");
+ Cmd_AddCommand("iplog_list", CL_IPLog_List_f, "lists names of players whose IP address begins with the supplied text (example: iplog_list 123.456.789)");
}
void CL_Parse_Shutdown(void)
projects / xonotic / darkplaces.git / blobdiff