X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_parse.c;h=bbef89ce48d0ed25865d1a5dc79b0e1bb45730f3;hp=b304a756c59486dadec924d0ca0d4545bca33e3e;hb=7a96ec58916ceea50684acf4c00eaef551199fef;hpb=aad158b86f1152258b6d0dc8052f2424c63ab5b7 diff --git a/cl_parse.c b/cl_parse.c index b304a756..bbef89ce 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -94,6 +94,9 @@ char *svc_strings[128] = "svc_entities", // 57 // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata "svc_csqcentities", // 58 // [short] entnum [variable length] entitydata ... [short] 0x0000 "svc_spawnstaticsound2", // 59 // [coord3] [short] samp [byte] vol [byte] aten + "svc_trailparticles", // 60 // [short] entnum [short] effectnum [vector] start [vector] end + "svc_pointparticles", // 61 // [short] effectnum [vector] start [vector] velocity [short] count + "svc_pointparticles1", // 62 // [short] effectnum [vector] start, same as svc_pointparticles except velocity is zero and count is 1 }; char *qw_svc_strings[128] = @@ -158,6 +161,7 @@ char *qw_svc_strings[128] = cvar_t demo_nehahra = {0, "demo_nehahra", "0", "reads all quake demos as nehahra movie protocol"}; cvar_t developer_networkentities = {0, "developer_networkentities", "0", "prints received entities, value is 0-4 (higher for more info)"}; +cvar_t cl_gameplayfix_soundsmovewithentities = {0, "cl_gameplayfix_soundsmovewithentities", "1", "causes sounds made by lifts, players, projectiles, and any other entities, to move with the entity, so for example a rocket noise follows the rocket rather than staying at the starting position"}; cvar_t cl_sound_wizardhit = {0, "cl_sound_wizardhit", "wizard/hit.wav", "sound to play during TE_WIZSPIKE (empty cvar disables sound)"}; cvar_t cl_sound_hknighthit = {0, "cl_sound_hknighthit", "hknight/hit.wav", "sound to play during TE_KNIGHTSPIKE (empty cvar disables sound)"}; cvar_t cl_sound_tink1 = {0, "cl_sound_tink1", "weapons/tink1.wav", "sound to play with 80% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"}; @@ -182,6 +186,8 @@ static void QW_CL_NextUpload(void); void QW_CL_StartUpload(unsigned char *data, int size); //static qboolean QW_CL_IsUploading(void); static void QW_CL_StopUpload(void); +void CL_VM_UpdateIntermissionState(int intermission); +qboolean CL_VM_Event_Sound(int sound_num, int volume, int channel, float attenuation, int ent, vec3_t pos); /* ================== @@ -242,7 +248,7 @@ void CL_ParseStartSoundPacket(int largesoundindex) channel &= 7; } - if (largesoundindex || field_mask & SND_LARGESOUND) + if (largesoundindex || (field_mask & SND_LARGESOUND) || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3) sound_num = (unsigned short) MSG_ReadShort (); else sound_num = MSG_ReadByte (); @@ -265,7 +271,8 @@ void CL_ParseStartSoundPacket(int largesoundindex) if (ent >= cl.max_entities) CL_ExpandEntities(ent); - S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation); + if( !CL_VM_Event_Sound(sound_num, volume / 255.0f, channel, attenuation, ent, pos) ) + S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation); } /* @@ -332,13 +339,13 @@ void CL_ParseEntityLump(char *entdata) data = entdata; if (!data) return; - if (!COM_ParseToken_Simple(&data, false)) + if (!COM_ParseToken_Simple(&data, false, false)) return; // error if (com_token[0] != '{') return; // error while (1) { - if (!COM_ParseToken_Simple(&data, false)) + if (!COM_ParseToken_Simple(&data, false, false)) return; // error if (com_token[0] == '}') break; // end of worldspawn @@ -348,7 +355,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_ParseToken_Simple(&data, false)) + if (!COM_ParseToken_Simple(&data, false, false)) return; // error strlcpy (value, com_token, sizeof (value)); if (!strcmp("sky", key)) @@ -358,7 +365,12 @@ void CL_ParseEntityLump(char *entdata) else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK) R_SetSkyBox(value); else if (!strcmp("fog", key)) - sscanf(value, "%f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue); + { + r_refdef.fog_start = 0; + r_refdef.fog_alpha = 1; + r_refdef.fog_end = 16384; + sscanf(value, "%f %f %f %f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue, &r_refdef.fog_alpha, &r_refdef.fog_start, &r_refdef.fog_end); + } else if (!strcmp("fog_density", key)) r_refdef.fog_density = atof(value); else if (!strcmp("fog_red", key)) @@ -367,11 +379,19 @@ void CL_ParseEntityLump(char *entdata) r_refdef.fog_green = atof(value); else if (!strcmp("fog_blue", key)) r_refdef.fog_blue = atof(value); + else if (!strcmp("fog_alpha", key)) + r_refdef.fog_alpha = atof(value); + else if (!strcmp("fog_start", key)) + r_refdef.fog_start = atof(value); + else if (!strcmp("fog_end", key)) + r_refdef.fog_end = atof(value); } } extern void CL_Locs_Reload_f(void); extern void CL_VM_Init (void); +static const vec3_t defaultmins = {-4096, -4096, -4096}; +static const vec3_t defaultmaxs = {4096, 4096, 4096}; static void CL_SetupWorldModel(void) { // update the world model @@ -380,16 +400,9 @@ static void CL_SetupWorldModel(void) // 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); - } + World_SetSize(&cl.world, cl.worldmodel->name, cl.worldmodel->normalmins, cl.worldmodel->normalmaxs); else - { - VectorSet(cl.world.areagrid_mins, -4096, -4096, -4096); - VectorSet(cl.world.areagrid_maxs, 4096, 4096, 4096); - } - World_Clear(&cl.world); + World_SetSize(&cl.world, "", defaultmins, defaultmaxs); // load or reload .loc file for team chat messages CL_Locs_Reload_f(); @@ -520,9 +533,6 @@ 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) @@ -989,10 +999,6 @@ void CL_BeginDownloads(qboolean aborteddownload) { // 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) @@ -1148,7 +1154,7 @@ void CL_BeginDownloads_f(void) // prevent cl_begindownloads from being issued multiple times in one match // to prevent accidentally cancelled downloads if(cl.loadbegun) - Con_DPrintf("cl_begindownloads is only valid once per match\n"); + Con_Printf("cl_begindownloads is only valid once per match\n"); else CL_BeginDownloads(false); } @@ -1274,6 +1280,7 @@ void CL_DownloadBegin_f(void) void CL_StopDownload_f(void) { + Curl_CancelAll(); if (cls.qw_downloadname[0]) { Con_Printf("Download of %s aborted\n", cls.qw_downloadname); @@ -1330,7 +1337,8 @@ An svc_signonnum has been received, perform a client side setup */ static void CL_SignonReply (void) { - Con_DPrintf("CL_SignonReply: %i\n", cls.signon); + if (developer.integer >= 100) + Con_Printf("CL_SignonReply: %i\n", cls.signon); switch (cls.signon) { @@ -1376,6 +1384,8 @@ static void CL_SignonReply (void) case 4: Con_ClearNotify(); + if (COM_CheckParm("-profilegameonly")) + Sys_AllowProfiling(true); break; } } @@ -1626,7 +1636,7 @@ void CL_ParseServerInfo (void) void CL_ValidateState(entity_state_t *s) { - model_t *model; + dp_model_t *model; if (!s->active) return; @@ -1634,30 +1644,25 @@ void CL_ValidateState(entity_state_t *s) if (s->modelindex >= MAX_MODELS) Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS); + // these warnings are only warnings, no corrections are made to the state + // because states are often copied for decoding, which otherwise would + // propogate some of the corrections accidentally + // (this used to happen, sometimes affecting skin and frame) + // colormap is client index + 1 if ((!s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients) - { Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients); - s->colormap = 0; - } model = cl.model_precache[s->modelindex]; if (model && model->type && s->frame >= model->numframes) - { Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes); - s->frame = 0; - } if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC)) - { Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins); - s->skin = 0; - } } void CL_MoveLerpEntityStates(entity_t *ent) { float odelta[3], adelta[3]; - CL_ValidateState(&ent->state_current); VectorSubtract(ent->state_current.origin, ent->persistent.neworigin, odelta); VectorSubtract(ent->state_current.angles, ent->persistent.newangles, adelta); if (!ent->state_previous.active || ent->state_previous.modelindex != ent->state_current.modelindex) @@ -1739,6 +1744,11 @@ void CL_ParseBaseline (entity_t *ent, int large) ent->state_baseline.modelindex = (unsigned short) MSG_ReadShort (); ent->state_baseline.frame = (unsigned short) MSG_ReadShort (); } + else if (cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3) + { + ent->state_baseline.modelindex = (unsigned short) MSG_ReadShort (); + ent->state_baseline.frame = MSG_ReadByte (); + } else { ent->state_baseline.modelindex = MSG_ReadByte (); @@ -1771,7 +1781,7 @@ void CL_ParseClientdata (void) VectorCopy (cl.mvelocity[0], cl.mvelocity[1]); cl.mviewzoom[1] = cl.mviewzoom[0]; - if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5) + if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3 || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5) { cl.stats[STAT_VIEWHEIGHT] = DEFAULT_VIEWHEIGHT; cl.stats[STAT_ITEMS] = 0; @@ -1805,7 +1815,7 @@ void CL_ParseClientdata (void) { if (bits & (SU_PUNCH1<render.framelerp = 0; // make torchs play out of sync ent->render.frame1time = ent->render.frame2time = lhrandom(-10, -1); - ent->render.colormap = -1; // no special coloring ent->render.skinnum = ent->state_baseline.skin; ent->render.effects = ent->state_baseline.effects; ent->render.alpha = 1; @@ -1926,7 +1938,7 @@ void CL_ParseStaticSound (int large) int sound_num, vol, atten; MSG_ReadVector(org, cls.protocol); - if (large) + if (large || cls.protocol == PROTOCOL_NEHAHRABJP2) sound_num = (unsigned short) MSG_ReadShort (); else sound_num = MSG_ReadByte (); @@ -1964,7 +1976,7 @@ void CL_ParseEffect2 (void) CL_Effect(org, modelindex, startframe, framecount, framerate); } -void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning) +void CL_NewBeam (int ent, vec3_t start, vec3_t end, dp_model_t *m, int lightning) { int i; beam_t *b = NULL; @@ -2003,7 +2015,7 @@ void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning) Con_Print("beam list overflow!\n"); } -void CL_ParseBeam (model_t *m, int lightning) +void CL_ParseBeam (dp_model_t *m, int lightning) { int ent; vec3_t start, end; @@ -2506,7 +2518,7 @@ void CL_ParseTempEntity(void) colorStart = MSG_ReadByte(); colorLength = MSG_ReadByte(); CL_ParticleExplosion2(pos, colorStart, colorLength); - tempcolor = (unsigned char *)&palette_complete[(rand()%colorLength) + colorStart]; + tempcolor = palette_rgb[(rand()%colorLength) + colorStart]; color[0] = tempcolor[0] * (2.0f / 255.0f); color[1] = tempcolor[1] * (2.0f / 255.0f); color[2] = tempcolor[2] * (2.0f / 255.0f); @@ -2889,7 +2901,7 @@ static void CL_NetworkTimeReceived(double 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) @@ -2948,7 +2960,7 @@ static void CL_NetworkTimeReceived(double newtime) } // this packet probably contains a player entity update, so we will need // to update the prediction - cl.movement_needupdate = true; + cl.movement_replay = true; // this may get updated later in parsing by svc_clientdata cl.onground = false; // if true the cl.viewangles are interpolated from cl.mviewangles[] @@ -2960,7 +2972,7 @@ static void CL_NetworkTimeReceived(double newtime) VectorCopy(cl.mviewangles[0], cl.mviewangles[1]); } -#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x); +#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s(%i)\n", msg_readcount-1, x, cmd); //[515]: csqc qboolean CL_VM_Parse_TempEntity (void); @@ -2984,6 +2996,7 @@ void CL_ParseServerMessage(void) unsigned char cmdlog[32]; char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; + qboolean qwplayerupdatereceived; // 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 @@ -3015,10 +3028,6 @@ void CL_ParseServerMessage(void) { CL_NetworkTimeReceived(realtime); // qw has no clock - // slightly kill qw player entities each frame - for (i = 1;i < cl.maxclients;i++) - cl.entities_active[i] = false; - // kill all qw nails cl.qw_num_nails = 0; @@ -3027,6 +3036,8 @@ void CL_ParseServerMessage(void) cls.servermovesequence = cls.netcon->qw.incoming_sequence; + qwplayerupdatereceived = false; + while (1) { if (msg_badread) @@ -3289,6 +3300,14 @@ void CL_ParseServerMessage(void) break; case qw_svc_playerinfo: + // slightly kill qw player entities now that we know there is + // an update of player entities this frame... + if (!qwplayerupdatereceived) + { + qwplayerupdatereceived = true; + for (i = 1;i < cl.maxclients;i++) + cl.entities_active[i] = false; + } EntityStateQW_ReadPlayerUpdate(); break; @@ -3315,14 +3334,20 @@ 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 (); + } 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 (); + } break; case qw_svc_maxspeed: @@ -3346,24 +3371,13 @@ void CL_ParseServerMessage(void) } } - // fully kill the still slightly dead qw player entities each frame, - // but only if a player update was received - for (i = 1;i <= cl.maxclients;i++) - if (cl.entities_active[i]) - break; - if (i <= cl.maxclients) + if (qwplayerupdatereceived) { - // kill all non-updated entities this frame + // fully kill any player entities that were not updated this frame for (i = 1;i <= cl.maxclients;i++) if (!cl.entities_active[i]) cl.entities[i].state_current.active = false; } - else - { - // no update this frame, restore the cl.entities_active for good measure - for (i = 1;i <= cl.maxclients;i++) - cl.entities_active[i] = cl.entities[i].state_current.active; - } } else { @@ -3548,7 +3562,7 @@ void CL_ParseServerMessage(void) { if (i >= 1 && i < MAX_MODELS) { - model_t *model = Mod_ForName(s, false, false, i == 1); + dp_model_t *model = Mod_ForName(s, false, false, i == 1); if (!model) Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s); cl.model_precache[i] = model; @@ -3825,6 +3839,7 @@ void CL_Parse_Init(void) if (gamemode == GAME_NEHAHRA) Cvar_SetValue("demo_nehahra", 1); Cvar_RegisterVariable(&developer_networkentities); + Cvar_RegisterVariable(&cl_gameplayfix_soundsmovewithentities); Cvar_RegisterVariable(&cl_sound_wizardhit); Cvar_RegisterVariable(&cl_sound_hknighthit);