X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=dbeda3864f362d9fc8721b9b4822841b138203ab;hb=315301a12b8f1b4a87d45d1d7b9174584db5138d;hp=4f1a07e2ac4bfa606a778918c7daab0e9fff68c0;hpb=e703adf309505c85d0814e3a34a4c7c525eb540a;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index 4f1a07e2..dbeda386 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -29,12 +29,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "menu.h" #endif #include "cl_video.h" +#include "float.h" const char *svc_strings[128] = { "svc_bad", "svc_nop", - "svc_disconnect", + "svc_disconnect", // (DP8) [string] null terminated parting message "svc_updatestat", "svc_version", // [int] server version "svc_setview", // [short] entity number @@ -183,11 +184,13 @@ cvar_t cl_readpicture_force = {CF_CLIENT, "cl_readpicture_force", "0", "when ena #define RIC_GUNSHOTQUAD 2 cvar_t cl_sound_ric_gunshot = {CF_CLIENT, "cl_sound_ric_gunshot", "0", "specifies if and when the related cl_sound_ric and cl_sound_tink sounds apply to TE_GUNSHOT/TE_GUNSHOTQUAD, 0 = no sound, 1 = TE_GUNSHOT, 2 = TE_GUNSHOTQUAD, 3 = TE_GUNSHOT and TE_GUNSHOTQUAD"}; cvar_t cl_sound_r_exp3 = {CF_CLIENT, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"}; +cvar_t snd_cdautopause = {CF_CLIENT | CF_ARCHIVE, "snd_cdautopause", "1", "pause the CD track while the game is paused"}; + cvar_t cl_serverextension_download = {CF_CLIENT, "cl_serverextension_download", "0", "indicates whether the server supports the download command"}; cvar_t cl_joinbeforedownloadsfinish = {CF_CLIENT | CF_ARCHIVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"}; -cvar_t cl_nettimesyncfactor = {CF_CLIENT | CF_ARCHIVE, "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 = {CF_CLIENT | CF_ARCHIVE, "cl_nettimesyncboundmode", "6", "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 = slighttly nicer version of Quake3 method, 6 = bounding + Quake3"}; -cvar_t cl_nettimesyncboundtolerance = {CF_CLIENT | CF_ARCHIVE, "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_nettimesyncfactor = {CF_CLIENT | CF_ARCHIVE, "cl_nettimesyncfactor", "0", "rate at which client time adapts to match server time, 1 = instantly, 0.125 = slowly, 0 = not at all (only applied in bound modes 0, 1, 2, 3)"}; +cvar_t cl_nettimesyncboundmode = {CF_CLIENT | CF_ARCHIVE, "cl_nettimesyncboundmode", "6", "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, 6 = tight bounding + mode 5, 7 = jitter compensated dynamic adjustment rate"}; +cvar_t cl_nettimesyncboundtolerance = {CF_CLIENT | CF_ARCHIVE, "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) (only affects bound modes 2 and 3)"}; cvar_t cl_iplog_name = {CF_CLIENT | CF_ARCHIVE, "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 qbool QW_CL_CheckOrDownloadFile(const char *filename); @@ -196,6 +199,13 @@ static void QW_CL_NextUpload_f(cmd_state_t *cmd); //static qbool QW_CL_IsUploading(void); static void QW_CL_StopUpload_f(cmd_state_t *cmd); +static inline void CL_SetSignonStage_WithMsg(int signon_stage) +{ + cls.signon = signon_stage; + dpsnprintf(cl_connect_status, sizeof(cl_connect_status), "Connect: signon stage %i of %i", cls.signon, SIGNONS); + Con_DPrint(cl_connect_status); +} + /* ================== CL_ParseStartSoundPacket @@ -330,10 +340,7 @@ void CL_KeepaliveMessage (qbool readmessages) if(cls.state != ca_dedicated) { if(countdownupdate <= 0) // check if time stepped backwards - { - SCR_UpdateLoadingScreenIfShown(); countdownupdate = 2; - } } } @@ -396,14 +403,14 @@ void CL_ParseEntityLump(char *entdata) if (com_token[0] == '}') break; // end of worldspawn if (com_token[0] == '_') - strlcpy (key, com_token + 1, sizeof (key)); + dp_strlcpy (key, com_token + 1, sizeof (key)); else - strlcpy (key, com_token, sizeof (key)); + dp_strlcpy (key, com_token, sizeof (key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; if (!COM_ParseToken_Simple(&data, false, false, true)) return; // error - strlcpy (value, com_token, sizeof (value)); + dp_strlcpy (value, com_token, sizeof (value)); if (!strcmp("sky", key)) { loadedsky = true; @@ -480,9 +487,9 @@ static void CL_SetupWorldModel(void) // set up csqc world for collision culling if (cl.worldmodel) { - strlcpy(cl.worldname, cl.worldmodel->name, sizeof(cl.worldname)); + dp_strlcpy(cl.worldname, cl.worldmodel->name, sizeof(cl.worldname)); FS_StripExtension(cl.worldname, cl.worldnamenoextension, sizeof(cl.worldnamenoextension)); - strlcpy(cl.worldbasename, !strncmp(cl.worldnamenoextension, "maps/", 5) ? cl.worldnamenoextension + 5 : cl.worldnamenoextension, sizeof(cl.worldbasename)); + dp_strlcpy(cl.worldbasename, !strncmp(cl.worldnamenoextension, "maps/", 5) ? cl.worldnamenoextension + 5 : cl.worldnamenoextension, sizeof(cl.worldbasename)); Cvar_SetQuick(&cl_worldmessage, cl.worldmessage); Cvar_SetQuick(&cl_worldname, cl.worldname); Cvar_SetQuick(&cl_worldnamenoextension, cl.worldnamenoextension); @@ -499,7 +506,7 @@ static void CL_SetupWorldModel(void) World_Start(&cl.world); // load or reload .loc file for team chat messages - CL_Locs_Reload_f(&cmd_client); + CL_Locs_Reload_f(cmd_local); // make sure we send enough keepalives CL_KeepaliveMessage(false); @@ -554,7 +561,7 @@ static qbool QW_CL_CheckOrDownloadFile(const char *filename) if (!cls.netcon) return true; - strlcpy(cls.qw_downloadname, filename, sizeof(cls.qw_downloadname)); + dp_strlcpy(cls.qw_downloadname, filename, sizeof(cls.qw_downloadname)); Con_Printf("Downloading %s\n", filename); if (!cls.qw_downloadmemory) @@ -614,7 +621,7 @@ static void QW_CL_RequestNextDownload(void) // if we're still in signon stages, request the next one if (cls.signon != SIGNONS) { - cls.signon = SIGNONS-1; + CL_SetSignonStage_WithMsg(SIGNONS - 1); // we'll go to SIGNONS when the first entity update is received MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); MSG_WriteString(&cls.netcon->message, va(vabuf, sizeof(vabuf), "begin %i", cl.qw_servercount)); @@ -831,7 +838,7 @@ static void QW_CL_ParseModelList(void) Host_Error("Server sent too many model precaches"); if (strlen(str) >= MAX_QPATH) Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1); - strlcpy(cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels])); + dp_strlcpy(cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels])); } n = MSG_ReadByte(&cl_message); @@ -842,7 +849,7 @@ static void QW_CL_ParseModelList(void) return; } - cls.signon = 2; + CL_SetSignonStage_WithMsg(2); cls.qw_downloadnumber = 0; cls.qw_downloadtype = dl_model; QW_CL_RequestNextDownload(); @@ -866,7 +873,7 @@ static void QW_CL_ParseSoundList(void) Host_Error("Server sent too many sound precaches"); if (strlen(str) >= MAX_QPATH) Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1); - strlcpy(cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds])); + dp_strlcpy(cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds])); } n = MSG_ReadByte(&cl_message); @@ -878,7 +885,7 @@ static void QW_CL_ParseSoundList(void) return; } - cls.signon = 2; + CL_SetSignonStage_WithMsg(2); cls.qw_downloadnumber = 0; cls.qw_downloadtype = dl_sound; QW_CL_RequestNextDownload(); @@ -898,7 +905,7 @@ static void QW_CL_Changing_f(cmd_state_t *cmd) S_StopAllSounds(); cl.intermission = 0; - cls.signon = 1; // not active anymore, but not disconnected + CL_SetSignonStage_WithMsg(1); // not active anymore, but not disconnected Con_Printf("\nChanging map...\n"); } @@ -939,7 +946,7 @@ void QW_CL_StartUpload(unsigned char *data, int size) return; // abort existing upload if in progress - QW_CL_StopUpload_f(&cmd_client); + QW_CL_StopUpload_f(cmd_local); Con_DPrintf("Starting upload of %d bytes...\n", size); @@ -948,7 +955,7 @@ void QW_CL_StartUpload(unsigned char *data, int size) cls.qw_uploadsize = size; cls.qw_uploadpos = 0; - QW_CL_NextUpload_f(&cmd_client); + QW_CL_NextUpload_f(cmd_local); } #if 0 @@ -980,7 +987,7 @@ static void QW_CL_ProcessUserInfo(int slot) InfoString_GetValue(cl.scores[slot].qw_userinfo, "team", cl.scores[slot].qw_team, sizeof(cl.scores[slot].qw_team)); InfoString_GetValue(cl.scores[slot].qw_userinfo, "skin", cl.scores[slot].qw_skin, sizeof(cl.scores[slot].qw_skin)); if (!cl.scores[slot].qw_skin[0]) - strlcpy(cl.scores[slot].qw_skin, "base", sizeof(cl.scores[slot].qw_skin)); + dp_strlcpy(cl.scores[slot].qw_skin, "base", sizeof(cl.scores[slot].qw_skin)); // TODO: skin cache } @@ -996,7 +1003,7 @@ static void QW_CL_UpdateUserInfo(void) return; } cl.scores[slot].qw_userid = MSG_ReadLong(&cl_message); - strlcpy(cl.scores[slot].qw_userinfo, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(cl.scores[slot].qw_userinfo)); + dp_strlcpy(cl.scores[slot].qw_userinfo, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(cl.scores[slot].qw_userinfo)); QW_CL_ProcessUserInfo(slot); } @@ -1007,8 +1014,8 @@ static void QW_CL_SetInfo(void) char key[2048]; char value[2048]; slot = MSG_ReadByte(&cl_message); - strlcpy(key, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(key)); - strlcpy(value, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(value)); + dp_strlcpy(key, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(key)); + dp_strlcpy(value, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(value)); if (slot >= cl.maxclients) { Con_Printf("svc_setinfo >= cl.maxclients\n"); @@ -1024,8 +1031,8 @@ static void QW_CL_ServerInfo(void) char key[2048]; char value[2048]; char temp[32]; - strlcpy(key, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(key)); - strlcpy(value, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(value)); + dp_strlcpy(key, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(key)); + dp_strlcpy(value, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof(value)); Con_DPrintf("SERVERINFO: %s=%s\n", key, value); InfoString_SetValue(cl.qw_serverinfo, sizeof(cl.qw_serverinfo), key, value); InfoString_GetValue(cl.qw_serverinfo, "teamplay", temp, sizeof(temp)); @@ -1060,9 +1067,10 @@ static void CL_UpdateItemsAndWeapon(void) // check for important changes // set flash times + // UBSan: unsigned literals because left shifting by 31 causes signed overflow, although it works as expected on x86. if (cl.olditems != cl.stats[STAT_ITEMS]) for (j = 0;j < 32;j++) - if ((cl.stats[STAT_ITEMS] & (1<message, clc_stringcmd); //MSG_WriteString (&cls.netcon->message, "prespawn"); } - else // playing a demo... make sure loading occurs as soon as possible - CL_BeginDownloads(false); + // execute cl_begindownloads next frame + // (after any commands added by svc_stufftext have been executed) + // when done with downloads the "prespawn" will be sent + Cbuf_AddText(cmd_local, "\ncl_begindownloads\n"); break; case 2: @@ -1687,8 +1694,11 @@ static void CL_ParseServerInfo (void) { SCR_BeginLoadingPlaque(false); S_StopAllSounds(); + // prevent dlcache assets from the previous map from interfering with this one + FS_UnloadPacks_dlcache(); // free q3 shaders so that any newly downloaded shaders will be active - Mod_FreeQ3Shaders(); + // bones_was_here: we free the q3 shaders later in CL_SignonReply + //Mod_FreeQ3Shaders(); } // check memory integrity @@ -1726,7 +1736,7 @@ static void CL_ParseServerInfo (void) str = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)); Con_Printf("server gamedir is %s\n", str); - strlcpy(gamedir[0], str, sizeof(gamedir[0])); + dp_strlcpy(gamedir[0], str, sizeof(gamedir[0])); // change gamedir if needed if (!FS_ChangeGameDirs(1, gamedir, true, false)) @@ -1744,7 +1754,7 @@ static void CL_ParseServerInfo (void) // get the full level name str = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)); - strlcpy (cl.worldmessage, str, sizeof(cl.worldmessage)); + dp_strlcpy (cl.worldmessage, str, sizeof(cl.worldmessage)); // get the movevars that are defined in the qw protocol cl.movevars_gravity = MSG_ReadFloat(&cl_message); @@ -1784,16 +1794,16 @@ static void CL_ParseServerInfo (void) cl.loadfinished = false; cls.state = ca_connected; - cls.signon = 1; + CL_SetSignonStage_WithMsg(1); // note: on QW protocol we can't set up the gameworld until after // downloads finish... // (we don't even know the name of the map yet) // this also means cl_autodemo does not work on QW protocol... - strlcpy(cl.worldname, "", sizeof(cl.worldname)); - strlcpy(cl.worldnamenoextension, "", sizeof(cl.worldnamenoextension)); - strlcpy(cl.worldbasename, "qw", sizeof(cl.worldbasename)); + dp_strlcpy(cl.worldname, "", sizeof(cl.worldname)); + dp_strlcpy(cl.worldnamenoextension, "", sizeof(cl.worldnamenoextension)); + dp_strlcpy(cl.worldbasename, "qw", sizeof(cl.worldbasename)); Cvar_SetQuick(&cl_worldname, cl.worldname); Cvar_SetQuick(&cl_worldnamenoextension, cl.worldnamenoextension); Cvar_SetQuick(&cl_worldbasename, cl.worldbasename); @@ -1821,7 +1831,7 @@ static void CL_ParseServerInfo (void) // parse signon message str = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)); - strlcpy (cl.worldmessage, str, sizeof(cl.worldmessage)); + dp_strlcpy (cl.worldmessage, str, sizeof(cl.worldmessage)); // seperate the printfs so the server message can have a color if (cls.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie @@ -1840,7 +1850,7 @@ static void CL_ParseServerInfo (void) Host_Error ("Server sent too many model precaches"); if (strlen(str) >= MAX_QPATH) Host_Error ("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1); - strlcpy (cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels])); + dp_strlcpy (cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels])); } // parse sound precache list for (numsounds=1 ; ; numsounds++) @@ -1852,13 +1862,13 @@ static void CL_ParseServerInfo (void) Host_Error("Server sent too many sound precaches"); if (strlen(str) >= MAX_QPATH) Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1); - strlcpy (cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds])); + dp_strlcpy (cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds])); } // set the base name for level-specific things... this gets updated again by CL_SetupWorldModel later - strlcpy(cl.worldname, cl.model_name[1], sizeof(cl.worldname)); + dp_strlcpy(cl.worldname, cl.model_name[1], sizeof(cl.worldname)); FS_StripExtension(cl.worldname, cl.worldnamenoextension, sizeof(cl.worldnamenoextension)); - strlcpy(cl.worldbasename, !strncmp(cl.worldnamenoextension, "maps/", 5) ? cl.worldnamenoextension + 5 : cl.worldnamenoextension, sizeof(cl.worldbasename)); + dp_strlcpy(cl.worldbasename, !strncmp(cl.worldnamenoextension, "maps/", 5) ? cl.worldnamenoextension + 5 : cl.worldnamenoextension, sizeof(cl.worldbasename)); Cvar_SetQuick(&cl_worldmessage, cl.worldmessage); Cvar_SetQuick(&cl_worldname, cl.worldname); Cvar_SetQuick(&cl_worldnamenoextension, cl.worldnamenoextension); @@ -1919,7 +1929,7 @@ static void CL_ParseServerInfo (void) if (cls.demorecording) { // finish the previous level's demo file - CL_Stop_f(&cmd_client); + CL_Stop_f(cmd_local); } // start a new demo file @@ -1940,7 +1950,7 @@ static void CL_ParseServerInfo (void) cls.forcetrack = -1; FS_Printf (cls.demofile, "%i\n", cls.forcetrack); cls.demorecording = true; - strlcpy(cls.demoname, demofile, sizeof(cls.demoname)); + dp_strlcpy(cls.demoname, demofile, sizeof(cls.demoname)); cls.demo_lastcsprogssize = -1; cls.demo_lastcsprogscrc = -1; } @@ -2300,7 +2310,7 @@ static void CL_ParseStaticSound (int large) int sound_num, vol, atten; MSG_ReadVector(&cl_message, org, cls.protocol); - if (large || cls.protocol == PROTOCOL_NEHAHRABJP2) + if (large) sound_num = (unsigned short) MSG_ReadShort(&cl_message); else sound_num = MSG_ReadByte(&cl_message); @@ -3023,10 +3033,10 @@ static void CL_IPLog_Add(const char *address, const char *name, qbool checkexist sz_name = strlen(name) + 1; cl_iplog_items[cl_iplog_numitems].address = (char *) Mem_Alloc(cls.permanentmempool, sz_address); cl_iplog_items[cl_iplog_numitems].name = (char *) Mem_Alloc(cls.permanentmempool, sz_name); - strlcpy(cl_iplog_items[cl_iplog_numitems].address, address, sz_address); + dp_strlcpy(cl_iplog_items[cl_iplog_numitems].address, address, sz_address); // 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, sz_name); + dp_strlcpy(cl_iplog_items[cl_iplog_numitems].name, name, sz_name); cl_iplog_numitems++; if (addtofile) { @@ -3278,10 +3288,10 @@ extern cvar_t host_timescale; extern cvar_t cl_lerpexcess; static void CL_NetworkTimeReceived(double newtime) { - double timehigh; + cl.opt_inputs_since_update = 0; cl.mtime[1] = cl.mtime[0]; cl.mtime[0] = newtime; - if (cl_nolerp.integer || cls.timedemo || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS) + if (cls.timedemo || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS) cl.time = cl.mtime[1] = newtime; else if (cls.demoplayback) { @@ -3293,7 +3303,9 @@ static void CL_NetworkTimeReceived(double newtime) } else if (cls.protocol != PROTOCOL_QUAKEWORLD) { + double timehigh = 0; // hush compiler warning cl.mtime[1] = max(cl.mtime[1], cl.mtime[0] - 0.1); + if (developer_extra.integer && vid_activewindow) { if (cl.time < cl.mtime[1] - (cl.mtime[0] - cl.mtime[1])) @@ -3301,22 +3313,36 @@ static void CL_NetworkTimeReceived(double newtime) else if (cl.time > cl.mtime[0] + (cl.mtime[0] - cl.mtime[1])) Con_DPrintf("--- 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) + +selectmode: + switch (cl_nettimesyncboundmode.integer) { + default: + Cvar_SetQuick(&cl_nettimesyncboundmode, cl_nettimesyncboundmode.defstring); + goto selectmode; + case 1: + case 2: + case 3: + // doesn't make sense for modes > 3 + 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; + switch (cl_nettimesyncboundmode.integer) + { + case 1: + cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]); + break; + case 2: + if (cl.time < cl.mtime[1] || cl.time > timehigh) + cl.time = cl.mtime[1]; + break; + case 3: + if ((cl.time < cl.mtime[1] && cl.oldtime < cl.mtime[1]) || (cl.time > timehigh && cl.oldtime > timehigh)) + cl.time = cl.mtime[1]; + break; + } + break; + + case 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) @@ -3325,20 +3351,44 @@ static void CL_NetworkTimeReceived(double newtime) cl.time -= 0.002 * cl.movevars_timescale; // fall into the past by 2ms else cl.time += 0.001 * cl.movevars_timescale; // creep forward 1ms - } - else if (cl_nettimesyncboundmode.integer == 5) - { + break; + + case 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 * cl.movevars_timescale, cl.mtime[1], cl.time + 0.001 * cl.movevars_timescale); - } - else if (cl_nettimesyncboundmode.integer == 6) - { + break; + + case 6: cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]); cl.time = bound(cl.time - 0.002 * cl.movevars_timescale, cl.mtime[1], cl.time + 0.001 * cl.movevars_timescale); + break; + + case 7: + /* bones_was_here: this aims to prevent disturbances in the force from affecting cl.time + * the rolling harmonic mean gives large time error outliers low significance + * correction rate is dynamic and gradual (max 10% of mean error per tic) + * time is correct within a few server frames of connect/map start + * can achieve microsecond accuracy when cl.realframetime is a multiple of sv.frametime + * prevents 0ms move frame times with uncapped fps + * smoothest mode esp. for vsynced clients on servers with aggressive inputtimeout + */ + { + unsigned char i; + float error; + // in event of packet loss, cl.mtime[1] could be very old, so avoid if possible + double target = cl.movevars_ticrate ? cl.mtime[0] - cl.movevars_ticrate : cl.mtime[1]; + cl.ts_error_stor[cl.ts_error_num] = 1.0f / max(fabs(cl.time - target), FLT_MIN); + cl.ts_error_num = (cl.ts_error_num + 1) % NUM_TS_ERRORS; + for (i = 0, error = 0.0f; i < NUM_TS_ERRORS; i++) + error += cl.ts_error_stor[i]; + error = 0.1f / (error / NUM_TS_ERRORS); + cl.time = bound(cl.time - error, target, cl.time + error); + } + break; } } // this packet probably contains a player entity update, so we will need @@ -3356,8 +3406,10 @@ static void CL_NetworkTimeReceived(double newtime) // update the csqc's server timestamps, critical for proper sync CSQC_UpdateNetworkTimes(cl.mtime[0], cl.mtime[1]); +#ifdef USEODE if (cl.mtime[0] > cl.mtime[1]) World_Physics_Frame(&cl.world, cl.mtime[0] - cl.mtime[1], cl.movevars_gravity); +#endif // only lerp entities that also get an update in this frame, when lerp excess is used if(cl_lerpexcess.value > 0) @@ -3393,6 +3445,7 @@ void CL_ParseServerMessage(void) qbool qwplayerupdatereceived; qbool strip_pqc; char vabuf[1024]; + size_t cl_readstring_len; // LadyHavoc: 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 @@ -3466,7 +3519,7 @@ void CL_ParseServerMessage(void) { char description[32*64], logtemp[64]; int count; - strlcpy(description, "packet dump: ", sizeof(description)); + dp_strlcpy(description, "packet dump: ", sizeof(description)); i = cmdcount - 32; if (i < 0) i = 0; @@ -3475,7 +3528,7 @@ void CL_ParseServerMessage(void) while(count > 0) { dpsnprintf(logtemp, sizeof(logtemp), "%3i:%s ", cmdlog[i], cmdlogname[i]); - strlcat(description, logtemp, sizeof(description)); + dp_strlcat(description, logtemp, sizeof(description)); count--; i++; i &= 31; @@ -3491,31 +3544,36 @@ void CL_ParseServerMessage(void) break; case qw_svc_disconnect: - Con_Printf("Server disconnected\n"); if (cls.demonum != -1) CL_NextDemo(); else - CL_Disconnect(); - return; + CL_DisconnectEx(true, "Server disconnected"); + break; case qw_svc_print: i = MSG_ReadByte(&cl_message); - temp = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)); + cl_readstring_len = MSG_ReadString_len(&cl_message, cl_readstring, sizeof(cl_readstring)); + temp = cl_readstring; if (CL_ExaminePrintString(temp)) // look for anything interesting like player IP addresses or ping reports { if (i == 3) // chat - CSQC_AddPrintText(va(vabuf, sizeof(vabuf), "\1%s", temp)); //[515]: csqc + { + cl_readstring_len = dpsnprintf(vabuf, sizeof(vabuf), "\1%s", temp); + CSQC_AddPrintText(vabuf, cl_readstring_len); //[515]: csqc + } else - CSQC_AddPrintText(temp); + CSQC_AddPrintText(temp, cl_readstring_len); } break; case qw_svc_centerprint: - CL_VM_Parse_CenterPrint(MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring))); //[515]: csqc + cl_readstring_len = MSG_ReadString_len(&cl_message, cl_readstring, sizeof(cl_readstring)); + CL_VM_Parse_CenterPrint(cl_readstring, cl_readstring_len); //[515]: csqc break; case qw_svc_stufftext: - CL_VM_Parse_StuffCmd(MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring))); //[515]: csqc + cl_readstring_len = MSG_ReadString_len(&cl_message, cl_readstring, sizeof(cl_readstring)); + CL_VM_Parse_StuffCmd(cl_readstring, cl_readstring_len); //[515]: csqc break; case qw_svc_damage: @@ -3548,7 +3606,7 @@ void CL_ParseServerMessage(void) Con_Printf ("svc_lightstyle >= MAX_LIGHTSTYLES"); break; } - strlcpy (cl.lightstyle[i].map, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof (cl.lightstyle[i].map)); + dp_strlcpy (cl.lightstyle[i].map, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof (cl.lightstyle[i].map)); cl.lightstyle[i].map[MAX_STYLESTRING - 1] = 0; cl.lightstyle[i].length = (int)strlen(cl.lightstyle[i].map); break; @@ -3658,7 +3716,7 @@ void CL_ParseServerMessage(void) break; case qw_svc_sellscreen: - Cmd_ExecuteString(&cmd_client, "help", src_local, true); + Cmd_ExecuteString(cmd_local, "help", 4, src_local, true); break; case qw_svc_smallkick: @@ -3729,20 +3787,14 @@ void CL_ParseServerMessage(void) EntityFrameQW_CL_ReadFrame(false); // first update is the final signon stage if (cls.signon == SIGNONS - 1) - { - cls.signon = SIGNONS; - CL_SignonReply (); - } + CL_SignonReply(SIGNONS); break; case qw_svc_deltapacketentities: EntityFrameQW_CL_ReadFrame(true); // first update is the final signon stage if (cls.signon == SIGNONS - 1) - { - cls.signon = SIGNONS; - CL_SignonReply (); - } + CL_SignonReply(SIGNONS); break; case qw_svc_maxspeed: @@ -3757,9 +3809,9 @@ void CL_ParseServerMessage(void) case qw_svc_setpause: cl.paused = MSG_ReadByte(&cl_message) != 0; - if (cl.paused) + if (cl.paused && snd_cdautopause.integer) CDAudio_Pause (); - else + else if (bgmvolume.value > 0.0f) CDAudio_Resume (); S_PauseGameSounds (cl.paused); break; @@ -3802,11 +3854,8 @@ void CL_ParseServerMessage(void) cmdlogname[cmdindex] = temp; SHOWNET("fast update"); if (cls.signon == SIGNONS - 1) - { // first update is the final signon stage - cls.signon = SIGNONS; - CL_SignonReply (); - } + CL_SignonReply(SIGNONS); EntityFrameQuake_ReadEntity (cmd&127); continue; } @@ -3827,7 +3876,7 @@ void CL_ParseServerMessage(void) { char description[32*64], tempdesc[64]; int count; - strlcpy (description, "packet dump: ", sizeof(description)); + dp_strlcpy (description, "packet dump: ", sizeof(description)); i = cmdcount - 32; if (i < 0) i = 0; @@ -3836,7 +3885,7 @@ void CL_ParseServerMessage(void) while(count > 0) { dpsnprintf (tempdesc, sizeof (tempdesc), "%3i:%s ", cmdlog[i], cmdlogname[i]); - strlcat (description, tempdesc, sizeof (description)); + dp_strlcat (description, tempdesc, sizeof (description)); count--; i++; i &= 31; @@ -3872,25 +3921,27 @@ void CL_ParseServerMessage(void) break; case svc_disconnect: - Con_Printf ("Server disconnected\n"); if (cls.demonum != -1) - CL_NextDemo (); + CL_NextDemo(); else - CL_Disconnect (); + CL_DisconnectEx(true, cls.protocol == PROTOCOL_DARKPLACES8 ? MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)) : "Server disconnected"); break; case svc_print: - temp = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)); + cl_readstring_len = MSG_ReadString_len(&cl_message, cl_readstring, sizeof(cl_readstring)); + temp = cl_readstring; if (CL_ExaminePrintString(temp)) // look for anything interesting like player IP addresses or ping reports - CSQC_AddPrintText(temp); //[515]: csqc + CSQC_AddPrintText(temp, cl_readstring_len); //[515]: csqc break; case svc_centerprint: - CL_VM_Parse_CenterPrint(MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring))); //[515]: csqc + cl_readstring_len = MSG_ReadString_len(&cl_message, cl_readstring, sizeof(cl_readstring)); + CL_VM_Parse_CenterPrint(cl_readstring, cl_readstring_len); //[515]: csqc break; case svc_stufftext: - temp = MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)); + cl_readstring_len = MSG_ReadString_len(&cl_message, cl_readstring, sizeof(cl_readstring)); + temp = cl_readstring; /* if(utf8_enable.integer) { strip_pqc = true; @@ -3921,11 +3972,15 @@ void CL_ParseServerMessage(void) if(*temp == 0x01) { ++temp; + --cl_readstring_len; while(*temp >= 0x01 && *temp <= 0x1F) + { ++temp; + --cl_readstring_len; + } } } - CL_VM_Parse_StuffCmd(temp); //[515]: csqc + CL_VM_Parse_StuffCmd(temp, cl_readstring_len); //[515]: csqc break; case svc_damage: @@ -3970,13 +4025,13 @@ void CL_ParseServerMessage(void) Con_Printf ("svc_lightstyle >= MAX_LIGHTSTYLES"); break; } - strlcpy (cl.lightstyle[i].map, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof (cl.lightstyle[i].map)); + dp_strlcpy (cl.lightstyle[i].map, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof (cl.lightstyle[i].map)); cl.lightstyle[i].map[MAX_STYLESTRING - 1] = 0; cl.lightstyle[i].length = (int)strlen(cl.lightstyle[i].map); break; case svc_sound: - CL_ParseStartSoundPacket(false); + CL_ParseStartSoundPacket(cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 ? true : false); break; case svc_precache: @@ -4027,7 +4082,7 @@ void CL_ParseServerMessage(void) i = MSG_ReadByte(&cl_message); if (i >= cl.maxclients) Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients"); - strlcpy (cl.scores[i].name, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof (cl.scores[i].name)); + dp_strlcpy (cl.scores[i].name, MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring)), sizeof (cl.scores[i].name)); break; case svc_updatefrags: @@ -4085,9 +4140,9 @@ void CL_ParseServerMessage(void) case svc_setpause: cl.paused = MSG_ReadByte(&cl_message) != 0; - if (cl.paused) + if (cl.paused && snd_cdautopause.integer) CDAudio_Pause (); - else + else if (bgmvolume.value > 0.0f) CDAudio_Resume (); S_PauseGameSounds (cl.paused); break; @@ -4098,8 +4153,7 @@ void CL_ParseServerMessage(void) // reconnect somehow, so allow signon 1 even if at signon 1 if (i <= cls.signon && i != 1) Host_Error ("Received signon %i when at %i", i, cls.signon); - cls.signon = i; - CL_SignonReply (); + CL_SignonReply(i); break; case svc_killedmonster: @@ -4125,7 +4179,7 @@ void CL_ParseServerMessage(void) break; case svc_spawnstaticsound: - CL_ParseStaticSound (false); + CL_ParseStaticSound (cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 ? true : false); break; case svc_spawnstaticsound2: @@ -4165,7 +4219,7 @@ void CL_ParseServerMessage(void) break; case svc_sellscreen: - Cmd_ExecuteString(&cmd_client, "help", src_local, true); + Cmd_ExecuteString(cmd_local, "help", 4, src_local, true); break; case svc_hidelmp: if (gamemode == GAME_TENEBRAE) @@ -4203,11 +4257,8 @@ void CL_ParseServerMessage(void) break; case svc_entities: if (cls.signon == SIGNONS - 1) - { // first update is the final signon stage - cls.signon = SIGNONS; - CL_SignonReply (); - } + CL_SignonReply(SIGNONS); if (cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3) EntityFrame_CL_ReadFrame(); else if (cls.protocol == PROTOCOL_DARKPLACES4) @@ -4268,7 +4319,7 @@ void CL_Parse_DumpPacket(void) void CL_Parse_ErrorCleanUp(void) { CL_StopDownload(0, 0); - QW_CL_StopUpload_f(&cmd_client); + QW_CL_StopUpload_f(cmd_local); } void CL_Parse_Init(void) @@ -4289,6 +4340,7 @@ void CL_Parse_Init(void) Cvar_RegisterVariable(&cl_sound_ric3); Cvar_RegisterVariable(&cl_sound_ric_gunshot); Cvar_RegisterVariable(&cl_sound_r_exp3); + Cvar_RegisterVariable(&snd_cdautopause); Cvar_RegisterVariable(&cl_joinbeforedownloadsfinish);