X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_tent.c;h=987ff449f4de1cb45c87d5f987c6689f2644519b;hb=81c6d549301b0b979d1c44faa6389cd13882cf92;hp=518b1ef417c1d58655a8375976e3bc9ad22a1dd3;hpb=a71156e14d3f1144f73e52ca14a2925c2420cfd0;p=xonotic%2Fdarkplaces.git diff --git a/cl_tent.c b/cl_tent.c index 518b1ef4..987ff449 100644 --- a/cl_tent.c +++ b/cl_tent.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -21,21 +21,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -#define MSG_ReadVector(v) {(v)[0] = MSG_ReadCoord();(v)[1] = MSG_ReadCoord();(v)[2] = MSG_ReadCoord();} - -cvar_t r_glowinglightning = {"r_glowinglightning", "1", true}; - int num_temp_entities; entity_t cl_temp_entities[MAX_TEMP_ENTITIES]; beam_t cl_beams[MAX_BEAMS]; -sfx_t *cl_sfx_wizhit; -sfx_t *cl_sfx_knighthit; -sfx_t *cl_sfx_tink1; -sfx_t *cl_sfx_ric1; -sfx_t *cl_sfx_ric2; -sfx_t *cl_sfx_ric3; -sfx_t *cl_sfx_r_exp3; +model_t *cl_model_bolt = NULL; +model_t *cl_model_bolt2 = NULL; +model_t *cl_model_bolt3 = NULL; +model_t *cl_model_beam = NULL; + +sfx_t *cl_sfx_wizhit; +sfx_t *cl_sfx_knighthit; +sfx_t *cl_sfx_tink1; +sfx_t *cl_sfx_ric1; +sfx_t *cl_sfx_ric2; +sfx_t *cl_sfx_ric3; +sfx_t *cl_sfx_r_exp3; /* ================= @@ -44,14 +45,13 @@ CL_ParseTEnt */ void CL_InitTEnts (void) { - Cvar_RegisterVariable(&r_glowinglightning); - cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav"); - cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav"); - cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav"); - cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav"); - cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav"); - cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav"); - cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav"); + cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav", false); + cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav", false); + cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav", false); + cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav", false); + cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav", false); + cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav", false); + cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav", false); } /* @@ -65,7 +65,7 @@ void CL_ParseBeam (model_t *m) vec3_t start, end; beam_t *b; int i; - + ent = MSG_ReadShort (); MSG_ReadVector(start); MSG_ReadVector(end); @@ -98,25 +98,6 @@ void CL_ParseBeam (model_t *m) Con_Printf ("beam list overflow!\n"); } -//void R_BlastParticles(vec3_t org, vec_t radius, vec_t power); -void R_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count); -void R_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int gravity, int randomvel); -void R_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int type); - -// attempts to find the nearest non-solid location, used for explosions mainly -void FindNonSolidLocation(vec3_t pos) -{ - if (SV_HullPointContents (cl.worldmodel->hulls, 0, pos) != CONTENTS_SOLID) return; - pos[0]-=1;if (SV_HullPointContents (cl.worldmodel->hulls, 0, pos) != CONTENTS_SOLID) return; - pos[0]+=2;if (SV_HullPointContents (cl.worldmodel->hulls, 0, pos) != CONTENTS_SOLID) return; - pos[0]-=1; - pos[1]-=1;if (SV_HullPointContents (cl.worldmodel->hulls, 0, pos) != CONTENTS_SOLID) return; - pos[1]+=2;if (SV_HullPointContents (cl.worldmodel->hulls, 0, pos) != CONTENTS_SOLID) return; - pos[1]-=1; - pos[2]-=1;if (SV_HullPointContents (cl.worldmodel->hulls, 0, pos) != CONTENTS_SOLID) return; - pos[2]+=2;if (SV_HullPointContents (cl.worldmodel->hulls, 0, pos) != CONTENTS_SOLID) return; - pos[2]-=1; -} /* ================= @@ -129,32 +110,34 @@ void CL_ParseTEnt (void) vec3_t pos; vec3_t dir; vec3_t pos2; - dlight_t *dl; + vec3_t color; int rnd; int colorStart, colorLength, count; - float velspeed; - byte *tempcolor; + float velspeed, radius; + qbyte *tempcolor; type = MSG_ReadByte (); switch (type) { case TE_WIZSPIKE: // spike hitting wall MSG_ReadVector(pos); - R_RunParticleEffect (pos, vec3_origin, 20, 30); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_RunParticleEffect (pos, vec3_origin, 20, 30); S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1); break; - + case TE_KNIGHTSPIKE: // spike hitting wall MSG_ReadVector(pos); - R_RunParticleEffect (pos, vec3_origin, 226, 20); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_RunParticleEffect (pos, vec3_origin, 226, 20); S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1); break; - + case TE_SPIKE: // spike hitting wall MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); // LordHavoc: changed to spark shower - R_SparkShower(pos, vec3_origin, 15); - //R_RunParticleEffect (pos, vec3_origin, 0, 10); + CL_SparkShower(pos, vec3_origin, 15); if ( rand() % 5 ) S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); else @@ -170,15 +153,10 @@ void CL_ParseTEnt (void) break; case TE_SPIKEQUAD: // quad spike hitting wall MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); // LordHavoc: changed to spark shower - R_SparkShower(pos, vec3_origin, 15); - //R_RunParticleEffect (pos, vec3_origin, 0, 10); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 200; - dl->die = cl.time + 0.2; - dl->decay = 1000; - dl->color[0] = 0.05;dl->color[1] = 0.05;dl->color[2] = 0.8; + CL_SparkShower(pos, vec3_origin, 15); + CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); if ( rand() % 5 ) S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); @@ -195,9 +173,9 @@ void CL_ParseTEnt (void) break; case TE_SUPERSPIKE: // super spike hitting wall MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); // LordHavoc: changed to dust shower - R_SparkShower(pos, vec3_origin, 30); - //R_RunParticleEffect (pos, vec3_origin, 0, 20); + CL_SparkShower(pos, vec3_origin, 30); if ( rand() % 5 ) S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); else @@ -213,15 +191,10 @@ void CL_ParseTEnt (void) break; case TE_SUPERSPIKEQUAD: // quad super spike hitting wall MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); // LordHavoc: changed to dust shower - R_SparkShower(pos, vec3_origin, 30); - //R_RunParticleEffect (pos, vec3_origin, 0, 20); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 200; - dl->die = cl.time + 0.2; - dl->decay = 1000; - dl->color[0] = 0.05;dl->color[1] = 0.05;dl->color[2] = 0.8; + CL_SparkShower(pos, vec3_origin, 30); + CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); if ( rand() % 5 ) S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); else @@ -242,11 +215,11 @@ void CL_ParseTEnt (void) dir[1] = MSG_ReadChar (); dir[2] = MSG_ReadChar (); count = MSG_ReadByte (); // amount of particles - R_BloodPuff(pos); + CL_BloodPuff(pos, dir, count); break; case TE_BLOOD2: // blood puff MSG_ReadVector(pos); - R_BloodPuff(pos); + CL_BloodPuff(pos, vec3_origin, 10); break; case TE_SPARK: // spark shower MSG_ReadVector(pos); @@ -254,7 +227,14 @@ void CL_ParseTEnt (void) dir[1] = MSG_ReadChar (); dir[2] = MSG_ReadChar (); count = MSG_ReadByte (); // amount of particles - R_SparkShower(pos, dir, count); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_SparkShower(pos, dir, count); + break; + case TE_PLASMABURN: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2); + CL_PlasmaBurn(pos); break; // LordHavoc: added for improved gore case TE_BLOODSHOWER: // vaporized body @@ -262,7 +242,7 @@ void CL_ParseTEnt (void) MSG_ReadVector(pos2); // maxs velspeed = MSG_ReadCoord (); // speed count = MSG_ReadShort (); // number of particles - R_BloodShower(pos, pos2, velspeed, count); + CL_BloodShower(pos, pos2, velspeed, count); break; case TE_PARTICLECUBE: // general purpose particle effect MSG_ReadVector(pos); // mins @@ -272,7 +252,7 @@ void CL_ParseTEnt (void) colorStart = MSG_ReadByte (); // color colorLength = MSG_ReadByte (); // gravity (1 or 0) velspeed = MSG_ReadCoord (); // randomvel - R_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed); + CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed); break; case TE_PARTICLERAIN: // general purpose particle effect @@ -281,7 +261,7 @@ void CL_ParseTEnt (void) MSG_ReadVector(dir); // dir count = MSG_ReadShort (); // number of particles colorStart = MSG_ReadByte (); // color - R_ParticleRain(pos, pos2, dir, count, colorStart, 0); + CL_ParticleRain(pos, pos2, dir, count, colorStart, 0); break; case TE_PARTICLESNOW: // general purpose particle effect @@ -290,168 +270,150 @@ void CL_ParseTEnt (void) MSG_ReadVector(dir); // dir count = MSG_ReadShort (); // number of particles colorStart = MSG_ReadByte (); // color - R_ParticleRain(pos, pos2, dir, count, colorStart, 1); + CL_ParticleRain(pos, pos2, dir, count, colorStart, 1); break; case TE_GUNSHOT: // bullet hitting wall MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); // LordHavoc: changed to dust shower - R_SparkShower(pos, vec3_origin, 15); - //R_RunParticleEffect (pos, vec3_origin, 0, 20); + CL_SparkShower(pos, vec3_origin, 15); break; case TE_GUNSHOTQUAD: // quad bullet hitting wall MSG_ReadVector(pos); - R_SparkShower(pos, vec3_origin, 15); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 200; - dl->die = cl.time + 0.2; - dl->decay = 1000; - dl->color[0] = 0.05;dl->color[1] = 0.05;dl->color[2] = 0.8; + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_SparkShower(pos, vec3_origin, 15); + CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); break; case TE_EXPLOSION: // rocket explosion MSG_ReadVector(pos); - FindNonSolidLocation(pos); - R_ParticleExplosion (pos, false); -// R_BlastParticles (pos, 120, 120); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 350; - dl->die = cl.time + 0.5; - dl->decay = 700; - dl->color[0] = 1.0;dl->color[1] = 0.8;dl->color[2] = 0.4; + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_ParticleExplosion (pos, false); + // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5 + CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5); S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSIONQUAD: // quad rocket explosion MSG_ReadVector(pos); - FindNonSolidLocation(pos); - R_ParticleExplosion (pos, false); -// R_BlastParticles (pos, 120, 480); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 600; - dl->die = cl.time + 0.5; - dl->decay = 1200; - dl->color[0] = 0.5;dl->color[1] = 0.4;dl->color[2] = 1.0; - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); - break; - - /* - case TE_SMOKEEXPLOSION: // rocket explosion with a cloud of smoke - MSG_ReadVector(pos); - FindNonSolidLocation(pos); - R_ParticleExplosion (pos, true); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 350; - dl->die = cl.time + 0.5; - dl->decay = 300; - dl->color[0] = 1.0;dl->color[1] = 0.8;dl->color[2] = 0.4; + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_ParticleExplosion (pos, false); + CL_AllocDlight (NULL, pos, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5); S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; - */ case TE_EXPLOSION3: // Nehahra movie colored lighting explosion MSG_ReadVector(pos); - FindNonSolidLocation(pos); - R_ParticleExplosion (pos, false); -// R_BlastParticles (pos, 120, 120); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 350; - dl->die = cl.time + 0.5; - dl->decay = 700; - dl->color[0] = MSG_ReadCoord();dl->color[1] = MSG_ReadCoord();dl->color[2] = MSG_ReadCoord(); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_ParticleExplosion (pos, false); + CL_AllocDlight (NULL, pos, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5); S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSIONRGB: // colored lighting explosion MSG_ReadVector(pos); - FindNonSolidLocation(pos); - R_ParticleExplosion (pos, false); -// R_BlastParticles (pos, 120, 120); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 350; - dl->die = cl.time + 0.5; - dl->decay = 700; - dl->color[0] = MSG_ReadByte() * (1.0 / 255.0);dl->color[1] = MSG_ReadByte() * (1.0 / 255.0);dl->color[2] = MSG_ReadByte() * (1.0 / 255.0); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_ParticleExplosion (pos, false); + color[0] = MSG_ReadByte() * (1.0 / 255.0); + color[1] = MSG_ReadByte() * (1.0 / 255.0); + color[2] = MSG_ReadByte() * (1.0 / 255.0); + CL_AllocDlight (NULL, pos, 350, color[0], color[1], color[2], 700, 0.5); S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; case TE_TAREXPLOSION: // tarbaby explosion MSG_ReadVector(pos); - FindNonSolidLocation(pos); - R_BlobExplosion (pos); -// R_BlastParticles (pos, 120, 120); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_BlobExplosion (pos); S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 600; - dl->die = cl.time + 0.5; - dl->decay = 1200; - dl->color[0] = 0.8;dl->color[1] = 0.4;dl->color[2] = 1.0; + CL_AllocDlight (NULL, pos, 600, 0.8f, 0.4f, 1.0f, 1200, 0.5); S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; + case TE_SMALLFLASH: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2); + break; + + case TE_CUSTOMFLASH: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); + radius = MSG_ReadByte() * 8; + velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0); + color[0] = MSG_ReadByte() * (1.0 / 255.0); + color[1] = MSG_ReadByte() * (1.0 / 255.0); + color[2] = MSG_ReadByte() * (1.0 / 255.0); + CL_AllocDlight (NULL, pos, radius, color[0], color[1], color[2], radius / velspeed, velspeed); + break; + + case TE_FLAMEJET: + MSG_ReadVector(pos); + MSG_ReadVector(dir); + count = MSG_ReadByte(); + CL_Flames(pos, dir, count); + break; + case TE_LIGHTNING1: // lightning bolts - CL_ParseBeam (Mod_ForName("progs/bolt.mdl", true)); + if (!cl_model_bolt) + cl_model_bolt = Mod_ForName("progs/bolt.mdl", true, false, false); + CL_ParseBeam (cl_model_bolt); break; - + case TE_LIGHTNING2: // lightning bolts - CL_ParseBeam (Mod_ForName("progs/bolt2.mdl", true)); + if (!cl_model_bolt2) + cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", true, false, false); + CL_ParseBeam (cl_model_bolt2); break; - + case TE_LIGHTNING3: // lightning bolts - CL_ParseBeam (Mod_ForName("progs/bolt3.mdl", true)); + if (!cl_model_bolt3) + cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, false, false); + CL_ParseBeam (cl_model_bolt3); break; -// PGM 01/21/97 +// PGM 01/21/97 case TE_BEAM: // grappling hook beam - CL_ParseBeam (Mod_ForName("progs/beam.mdl", true)); + if (!cl_model_beam) + cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false); + CL_ParseBeam (cl_model_beam); break; // PGM 01/21/97 // LordHavoc: for compatibility with the Nehahra movie... case TE_LIGHTNING4NEH: - CL_ParseBeam (Mod_ForName(MSG_ReadString(), true)); + CL_ParseBeam (Mod_ForName(MSG_ReadString(), true, false, false)); break; - case TE_LAVASPLASH: + case TE_LAVASPLASH: pos[0] = MSG_ReadCoord (); pos[1] = MSG_ReadCoord (); pos[2] = MSG_ReadCoord (); - R_LavaSplash (pos); + CL_LavaSplash (pos); break; - + case TE_TELEPORT: pos[0] = MSG_ReadCoord (); pos[1] = MSG_ReadCoord (); pos[2] = MSG_ReadCoord (); - R_TeleportSplash (pos); + CL_AllocDlight (NULL, pos, 1000, 1.25f, 1.25f, 1.25f, 3000, 99.0f); +// CL_TeleportSplash (pos); break; - + case TE_EXPLOSION2: // color mapped explosion MSG_ReadVector(pos); - FindNonSolidLocation(pos); + Mod_FindNonSolidLocation(pos, cl.worldmodel); colorStart = MSG_ReadByte (); colorLength = MSG_ReadByte (); - R_ParticleExplosion2 (pos, colorStart, colorLength); -// R_BlastParticles (pos, 80, 80); - dl = CL_AllocDlight (0); - VectorCopy (pos, dl->origin); - dl->radius = 350; - dl->die = cl.time + 0.5; - dl->decay = 700; - tempcolor = (byte *)&d_8to24table[(rand()%colorLength) + colorStart]; - dl->color[0] = tempcolor[0] * (1.0f / 255.0f);dl->color[1] = tempcolor[1] * (1.0f / 255.0f);dl->color[2] = tempcolor[2] * (1.0f / 255.0f); + CL_ParticleExplosion2 (pos, colorStart, colorLength); + tempcolor = (qbyte *)&d_8to24table[(rand()%colorLength) + colorStart]; + CL_AllocDlight (NULL, pos, 350, tempcolor[0] * (1.0f / 255.0f), tempcolor[1] * (1.0f / 255.0f), tempcolor[2] * (1.0f / 255.0f), 700, 0.5); S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; - + default: Host_Error ("CL_ParseTEnt: bad type %d", type); } @@ -467,20 +429,17 @@ entity_t *CL_NewTempEntity (void) { entity_t *ent; - if (cl_numvisedicts == MAX_VISEDICTS) + if (r_refdef.numentities >= MAX_VISEDICTS) return NULL; - if (num_temp_entities == MAX_TEMP_ENTITIES) + if (num_temp_entities >= MAX_TEMP_ENTITIES) return NULL; - ent = &cl_temp_entities[num_temp_entities]; + ent = &cl_temp_entities[num_temp_entities++]; memset (ent, 0, sizeof(*ent)); - num_temp_entities++; - cl_visedicts[cl_numvisedicts] = ent; - cl_numvisedicts++; - - ent->colormap = -1; // no special coloring - ent->scale = 1; - ent->alpha = 1; - ent->colormod[0] = ent->colormod[1] = ent->colormod[2] = 1; + r_refdef.entities[r_refdef.numentities++] = &ent->render; + + ent->render.colormap = -1; // no special coloring + ent->render.scale = 1; + ent->render.alpha = 1; return ent; } @@ -499,7 +458,6 @@ void CL_UpdateTEnts (void) entity_t *ent; float yaw, pitch; float forward; - dlight_t *dl; num_temp_entities = 0; @@ -509,13 +467,11 @@ void CL_UpdateTEnts (void) if (!b->model || b->endtime < cl.time) continue; - // if coming from the player, update the start position + // if coming from the player, update the start position if (b->entity == cl.viewentity) - { - VectorCopy (cl_entities[cl.viewentity].origin, b->start); - } + VectorCopy (cl_entities[cl.viewentity].render.origin, b->start); - // calculate pitch and yaw + // calculate pitch and yaw VectorSubtract (b->end, b->start, dist); if (dist[1] == 0 && dist[0] == 0) @@ -538,7 +494,7 @@ void CL_UpdateTEnts (void) pitch += 360; } - // add new entities for the lightning + // add new entities for the lightning VectorCopy (b->start, org); d = VectorNormalizeLength(dist); while (d > 0) @@ -546,27 +502,16 @@ void CL_UpdateTEnts (void) ent = CL_NewTempEntity (); if (!ent) return; - VectorCopy (org, ent->origin); - ent->model = b->model; - ent->effects = EF_FULLBRIGHT; - ent->angles[0] = pitch; - ent->angles[1] = yaw; - ent->angles[2] = rand()%360; - - if (r_glowinglightning.value) - { - dl = CL_AllocDlight (0); - VectorCopy (ent->origin, dl->origin); - dl->radius = 100 + (rand()&31); - dl->die = cl.time + 0.001; - dl->color[0] = 1;dl->color[1] = 1;dl->color[2] = 1; - } - + VectorCopy (org, ent->render.origin); + ent->render.model = b->model; + ent->render.effects = EF_FULLBRIGHT; + ent->render.angles[0] = pitch; + ent->render.angles[1] = yaw; + ent->render.angles[2] = rand()%360; VectorMA(org, 30, dist, org); d -= 30; } } - -} +}