X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_parse.c;h=b304a756c59486dadec924d0ca0d4545bca33e3e;hp=0542b584f1c42a69da581d4d6468ab8a02a58920;hb=aad158b86f1152258b6d0dc8052f2424c63ab5b7;hpb=a9be87735a48f0cf3ccf143e661f6bd917091730 diff --git a/cl_parse.c b/cl_parse.c index 0542b584..b304a756 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -172,7 +172,7 @@ cvar_t cl_sound_r_exp3 = {0, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"}; 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", "4", "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"}; +cvar_t cl_nettimesyncboundmode = {CVAR_SAVE, "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 = {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"}; @@ -262,6 +262,9 @@ void CL_ParseStartSoundPacket(int largesoundindex) return; } + if (ent >= cl.max_entities) + CL_ExpandEntities(ent); + S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation); } @@ -284,7 +287,7 @@ void CL_KeepaliveMessage (qboolean readmessages) sizebuf_t old; // no need if server is local and definitely not if this is a demo - if (sv.active || !cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD) + if (!cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD) return; if (readmessages) @@ -315,7 +318,7 @@ void CL_KeepaliveMessage (qboolean readmessages) msg.data = buf; msg.maxsize = sizeof(buf); MSG_WriteChar(&msg, clc_nop); - NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000); + NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, false); } } @@ -329,13 +332,13 @@ void CL_ParseEntityLump(char *entdata) data = entdata; if (!data) return; - if (!COM_ParseTokenConsole(&data)) + if (!COM_ParseToken_Simple(&data, false)) return; // error if (com_token[0] != '{') return; // error while (1) { - if (!COM_ParseTokenConsole(&data)) + if (!COM_ParseToken_Simple(&data, false)) return; // error if (com_token[0] == '}') break; // end of worldspawn @@ -345,7 +348,7 @@ void CL_ParseEntityLump(char *entdata) strlcpy (key, com_token, sizeof (key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - if (!COM_ParseTokenConsole(&data)) + if (!COM_ParseToken_Simple(&data, false)) return; // error strlcpy (value, com_token, sizeof (value)); if (!strcmp("sky", key)) @@ -367,6 +370,47 @@ void CL_ParseEntityLump(char *entdata) } } +extern void CL_Locs_Reload_f(void); +extern void CL_VM_Init (void); +static void CL_SetupWorldModel(void) +{ + // update the world model + cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1]; + CL_UpdateRenderEntity(&cl.entities[0].render); + + // set up csqc world for collision culling + if (cl.worldmodel) + { + VectorCopy(cl.worldmodel->normalmins, cl.world.areagrid_mins); + VectorCopy(cl.worldmodel->normalmaxs, cl.world.areagrid_maxs); + } + else + { + VectorSet(cl.world.areagrid_mins, -4096, -4096, -4096); + VectorSet(cl.world.areagrid_maxs, 4096, 4096, 4096); + } + World_Clear(&cl.world); + + // load or reload .loc file for team chat messages + CL_Locs_Reload_f(); + + // reset particles and other per-level things + R_Modules_NewMap(); + + // load the team chat beep if possible + cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav"); + + // check memory integrity + Mem_CheckSentinelsGlobal(); + + // load the csqc now + if (cl.loadcsqc) + { + cl.loadcsqc = false; + CL_VM_Init(); + } +} + static qboolean QW_CL_CheckOrDownloadFile(const char *filename) { qfile_t *file; @@ -410,7 +454,6 @@ static qboolean QW_CL_CheckOrDownloadFile(const char *filename) return false; } -extern void CL_Locs_Reload_f(void); static void QW_CL_ProcessUserInfo(int slot); static void QW_CL_RequestNextDownload(void) { @@ -477,6 +520,9 @@ static void QW_CL_RequestNextDownload(void) cls.qw_downloadtype = dl_none; + // parse the Q3 shader files + Mod_LoadQ3Shaders(); + // touch all of the precached models that are still loaded so we can free // anything that isn't needed if (!sv.active) @@ -507,13 +553,7 @@ static void QW_CL_RequestNextDownload(void) // now that we have a world model, set up the world entity, renderer // modules and csqc - cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1]; - CL_UpdateRenderEntity(&cl.entities[0].render); - - CL_Locs_Reload_f(); - R_Modules_NewMap(); - - cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav"); + CL_SetupWorldModel(); // add pmodel/emodel CRCs to userinfo CL_SetInfo("pmodel", va("%i", FS_CRCFile("progs/player.mdl", NULL)), true, true, true, true); @@ -938,13 +978,21 @@ void CL_BeginDownloads(qboolean aborteddownload) && cl_serverextension_download.integer && (FS_CRCFile(csqc_progname.string, &progsize) != csqc_progcrc.integer || ((int)progsize != csqc_progsize.integer && csqc_progsize.integer != -1)) && !FS_FileExists(va("dlcache/%s.%i.%i", csqc_progname.string, csqc_progsize.integer, csqc_progcrc.integer))) + { + Con_Printf("Downloading new CSQC code to dlcache/%s.%i.%i\n", csqc_progname.string, csqc_progsize.integer, csqc_progcrc.integer); Cmd_ForwardStringToServer(va("download %s", csqc_progname.string)); + return; + } } if (cl.loadmodel_current < cl.loadmodel_total) { // loading models + // parse the Q3 shader files + if (cl.loadmodel_current < 2) + Mod_LoadQ3Shaders(); + for (;cl.loadmodel_current < cl.loadmodel_total;cl.loadmodel_current++) { if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw) @@ -955,13 +1003,7 @@ void CL_BeginDownloads(qboolean aborteddownload) if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw && cl.loadmodel_current == 1) { // we now have the worldmodel so we can set up the game world - cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1]; - 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(); + CL_SetupWorldModel(); if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer) { cl.loadfinished = true; @@ -1006,13 +1048,7 @@ void CL_BeginDownloads(qboolean aborteddownload) if (cl.downloadmodel_current == 1) { // the worldmodel failed, but we need to set up anyway - cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1]; - 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(); + CL_SetupWorldModel(); if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer) { cl.loadfinished = true; @@ -1046,13 +1082,7 @@ void CL_BeginDownloads(qboolean aborteddownload) if (cl.downloadmodel_current == 1) { // we now have the worldmodel so we can set up the game world - cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1]; - 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(); + CL_SetupWorldModel(); if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer) { cl.loadfinished = true; @@ -1125,7 +1155,7 @@ void CL_BeginDownloads_f(void) void CL_StopDownload(int size, int crc) { - if (cls.qw_downloadmemory && cls.qw_downloadmemorycursize == size && CRC_Block(cls.qw_downloadmemory, size) == crc) + if (cls.qw_downloadmemory && cls.qw_downloadmemorycursize == size && CRC_Block(cls.qw_downloadmemory, cls.qw_downloadmemorycursize) == crc) { int existingcrc; size_t existingsize; @@ -1163,6 +1193,11 @@ void CL_StopDownload(int size, int crc) FS_Rescan(); } } + else if (cls.qw_downloadmemory && size) + { + Con_Printf("Download \"%s\" is corrupt (%i bytes, %i CRC, should be %i bytes, %i CRC), discarding\n", cls.qw_downloadname, size, crc, (int)cls.qw_downloadmemorycursize, (int)CRC_Block(cls.qw_downloadmemory, cls.qw_downloadmemorycursize)); + CL_BeginDownloads(true); + } if (cls.qw_downloadmemory) Mem_Free(cls.qw_downloadmemory); @@ -1361,7 +1396,10 @@ void CL_ParseServerInfo (void) // if server is active, we already began a loading plaque if (!sv.active) + { SCR_BeginLoadingPlaque(); + S_StopAllSounds(); + } // check memory integrity Mem_CheckSentinelsGlobal(); @@ -1411,14 +1449,14 @@ void CL_ParseServerInfo (void) i = MSG_ReadByte(); // cl.qw_spectator is an unneeded flag, cl.scores[cl.playerentity].qw_spectator works better (it can be updated by the server during the game) //cl.qw_spectator = (i & 128) != 0; - cl.playerentity = cl.viewentity = (i & 127) + 1; + cl.realplayerentity = cl.playerentity = cl.viewentity = (i & 127) + 1; cl.scores = (scoreboard_t *)Mem_Alloc(cls.levelmempool, cl.maxclients*sizeof(*cl.scores)); // get the full level name str = MSG_ReadString (); strlcpy (cl.levelname, str, sizeof(cl.levelname)); - // get the movevars + // get the movevars that are defined in the qw protocol cl.movevars_gravity = MSG_ReadFloat(); cl.movevars_stopspeed = MSG_ReadFloat(); cl.movevars_maxspeed = MSG_ReadFloat(); @@ -1429,14 +1467,16 @@ void CL_ParseServerInfo (void) cl.movevars_friction = MSG_ReadFloat(); cl.movevars_waterfriction = MSG_ReadFloat(); cl.movevars_entgravity = MSG_ReadFloat(); + // other movevars not in the protocol... - cl.movevars_slowmo = 1; + cl.movevars_wallfriction = 0; + cl.movevars_timescale = 1; cl.movevars_jumpvelocity = 270; cl.movevars_edgefriction = 2; cl.movevars_maxairspeed = 30; cl.movevars_stepheight = 18; - cl.movevars_airaccel_qw = 1.0; - cl.movevars_airaccel_sideways_friction = 0.0; + cl.movevars_airaccel_qw = 1; + cl.movevars_airaccel_sideways_friction = 0; // seperate the printfs so the server message can have a color Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str); @@ -1546,6 +1586,7 @@ void CL_ParseServerInfo (void) cl.downloadcsqc = true; cl.loadbegun = false; cl.loadfinished = false; + cl.loadcsqc = true; } // check memory integrity @@ -1629,7 +1670,7 @@ void CL_MoveLerpEntityStates(entity_t *ent) VectorCopy(ent->state_current.origin, ent->persistent.neworigin); VectorCopy(ent->state_current.angles, ent->persistent.newangles); // reset animation interpolation as well - ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame; + ent->render.frame1 = ent->render.frame2 = ent->state_current.frame; ent->render.frame1time = ent->render.frame2time = cl.time; ent->render.framelerp = 1; // reset various persistent stuff @@ -1858,7 +1899,7 @@ void CL_ParseStatic (int large) // copy it to the current state ent->render.model = cl.model_precache[ent->state_baseline.modelindex]; - ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame; + ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame; ent->render.framelerp = 0; // make torchs play out of sync ent->render.frame1time = ent->render.frame2time = lhrandom(-10, -1); @@ -2537,6 +2578,15 @@ void CL_ParsePointParticles(void) CL_ParticleEffect(effectindex, count, origin, origin, velocity, velocity, NULL, 0); } +void CL_ParsePointParticles1(void) +{ + int effectindex; + vec3_t origin; + effectindex = (unsigned short)MSG_ReadShort(); + MSG_ReadVector(origin, cls.protocol); + CL_ParticleEffect(effectindex, 1, origin, origin, vec3_origin, vec3_origin, NULL, 0); +} + typedef struct cl_iplog_item_s { char *address; @@ -2695,6 +2745,9 @@ qboolean CL_ExaminePrintString(const char *text) if (!strcmp(text, "Client ping times:\n")) { cl.parsingtextmode = CL_PARSETEXTMODE_PING; + // hide ping reports in demos + if (cls.demoplayback) + cl.parsingtextexpectingpingforscores = 1; for(cl.parsingtextplayerindex = 0; cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0]; cl.parsingtextplayerindex++) ; if (cl.parsingtextplayerindex >= cl.maxclients) // should never happen, since the client itself should be in cl.scores @@ -2831,12 +2884,21 @@ extern cvar_t slowmo; static void CL_NetworkTimeReceived(double newtime) { double timehigh; - cl.mtime[1] = max(cl.mtime[0], newtime - 0.1); + cl.mtime[1] = cl.mtime[0]; cl.mtime[0] = newtime; if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS) cl.time = cl.mtime[1] = newtime; + else if (cls.demoplayback) + { + // when time falls behind during demo playback it means the cl.mtime[1] was altered + // due to a large time gap, so treat it as an instant change in time + // (this can also happen during heavy packet loss in the demo) + if (cl.time < newtime - 0.1) + cl.mtime[1] = cl.time = newtime; + } else if (cls.protocol != PROTOCOL_QUAKEWORLD) { + cl.mtime[1] = max(cl.mtime[1], cl.mtime[0] - 0.1); if (developer.integer >= 100 && vid_activewindow) { if (cl.time < cl.mtime[1] - (cl.mtime[0] - cl.mtime[1])) @@ -2865,9 +2927,23 @@ static void CL_NetworkTimeReceived(double newtime) 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 * cl.movevars_slowmo; // fall into the past by 2ms + cl.time -= 0.002 * cl.movevars_timescale; // fall into the past by 2ms else - cl.time += 0.001 * cl.movevars_slowmo; // creep forward 1ms + cl.time += 0.001 * cl.movevars_timescale; // 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 * cl.movevars_timescale, cl.mtime[1], cl.time + 0.001 * cl.movevars_timescale); + } + else if (cl_nettimesyncboundmode.integer == 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); } } // this packet probably contains a player entity update, so we will need @@ -2887,7 +2963,6 @@ static void CL_NetworkTimeReceived(double newtime) #define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x); //[515]: csqc -void CL_VM_Init (void); qboolean CL_VM_Parse_TempEntity (void); void CL_VM_Parse_StuffCmd (const char *msg); void CL_VM_Parse_CenterPrint (const char *msg); @@ -3045,7 +3120,6 @@ void CL_ParseServerMessage(void) case qw_svc_serverdata: //Cbuf_Execute(); // make sure any stuffed commands are done CL_ParseServerInfo(); - CL_VM_Init(); //[515]: init csqc break; case qw_svc_setangle: @@ -3162,16 +3236,18 @@ void CL_ParseServerMessage(void) break; case qw_svc_intermission: + if(!cl.intermission) + cl.completed_time = cl.time; cl.intermission = 1; - cl.completed_time = cl.time; MSG_ReadVector(cl.qw_intermission_origin, cls.protocol); for (i = 0;i < 3;i++) cl.qw_intermission_angles[i] = MSG_ReadAngle(cls.protocol); break; case qw_svc_finale: + if(!cl.intermission) + cl.completed_time = cl.time; cl.intermission = 2; - cl.completed_time = cl.time; SCR_CenterPrint(MSG_ReadString ()); break; @@ -3255,6 +3331,8 @@ void CL_ParseServerMessage(void) case qw_svc_entgravity: cl.movevars_entgravity = MSG_ReadFloat(); + if (!cl.movevars_entgravity) + cl.movevars_entgravity = 1.0f; break; case qw_svc_setpause: @@ -3411,7 +3489,6 @@ void CL_ParseServerMessage(void) case svc_serverinfo: CL_ParseServerInfo (); - CL_VM_Init(); //[515]: init csqc break; case svc_setangle: @@ -3434,7 +3511,10 @@ void CL_ParseServerMessage(void) if (cl.viewentity >= cl.max_entities) CL_ExpandEntities(cl.viewentity); // LordHavoc: assume first setview recieved is the real player entity - if (!cl.playerentity) + if (!cl.realplayerentity) + cl.realplayerentity = cl.viewentity; + // update cl.playerentity to this one if it is a valid player + if (cl.viewentity >= 1 && cl.viewentity <= cl.maxclients) cl.playerentity = cl.viewentity; break; @@ -3616,19 +3696,25 @@ void CL_ParseServerMessage(void) break; case svc_intermission: + if(!cl.intermission) + cl.completed_time = cl.time; cl.intermission = 1; - cl.completed_time = cl.time; + CL_VM_UpdateIntermissionState(cl.intermission); break; case svc_finale: + if(!cl.intermission) + cl.completed_time = cl.time; cl.intermission = 2; - cl.completed_time = cl.time; + CL_VM_UpdateIntermissionState(cl.intermission); SCR_CenterPrint(MSG_ReadString ()); break; case svc_cutscene: + if(!cl.intermission) + cl.completed_time = cl.time; cl.intermission = 3; - cl.completed_time = cl.time; + CL_VM_UpdateIntermissionState(cl.intermission); SCR_CenterPrint(MSG_ReadString ()); break; @@ -3695,6 +3781,9 @@ void CL_ParseServerMessage(void) case svc_pointparticles: CL_ParsePointParticles(); break; + case svc_pointparticles1: + CL_ParsePointParticles1(); + break; } } }