*/
void CL_ParseStartSoundPacket(int largesoundindex)
{
- vec3_t pos;
- int channel, ent;
- int sound_num;
- int volume;
- int field_mask;
- float attenuation;
- int i;
-
- field_mask = MSG_ReadByte();
-
- if (field_mask & SND_VOLUME)
+ vec3_t pos;
+ int channel, ent;
+ int sound_num;
+ int volume;
+ int field_mask;
+ float attenuation;
+ int i;
+
+ field_mask = MSG_ReadByte();
+
+ if (field_mask & SND_VOLUME)
volume = MSG_ReadByte ();
else
volume = DEFAULT_SOUND_PACKET_VOLUME;
-
- if (field_mask & SND_ATTENUATION)
+
+ if (field_mask & SND_ATTENUATION)
attenuation = MSG_ReadByte () / 64.0;
else
attenuation = DEFAULT_SOUND_PACKET_ATTENUATION;
-
- channel = MSG_ReadShort ();
- if (largesoundindex)
+
+ if (field_mask & SND_LARGEENTITY)
+ {
+ ent = (unsigned short) MSG_ReadShort ();
+ channel = MSG_ReadByte ();
+ }
+ else
+ {
+ channel = (unsigned short) MSG_ReadShort ();
+ ent = channel >> 3;
+ channel &= 7;
+ }
+
+ if (largesoundindex || field_mask & SND_LARGESOUND)
sound_num = (unsigned short) MSG_ReadShort ();
else
sound_num = MSG_ReadByte ();
if (sound_num >= MAX_SOUNDS)
Host_Error("CL_ParseStartSoundPacket: sound_num (%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS);
- ent = channel >> 3;
- channel &= 7;
- if (ent > MAX_EDICTS)
+ if (ent >= MAX_EDICTS)
Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent);
-
- for (i=0 ; i<3 ; i++)
+
+ for (i = 0;i < 3;i++)
pos[i] = MSG_ReadCoord ();
- S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
+ S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation);
}
/*
int c;
sizebuf_t old;
qbyte olddata[8192];
-
+
if (sv.active)
return; // no need if server is local
if (cls.demoplayback)
// read messages from server, should just be nops
old = net_message;
memcpy (olddata, net_message.data, net_message.cursize);
-
+
do
{
ret = CL_GetMessage ();
==================
*/
qbyte entlife[MAX_EDICTS];
+// FIXME: this is a lot of memory to be keeping around, this needs to be dynamically allocated and freed
+static char parse_model_precache[MAX_MODELS][MAX_QPATH];
+static char parse_sound_precache[MAX_SOUNDS][MAX_QPATH];
void CL_ParseServerInfo (void)
{
char *str;
int i;
int nummodels, numsounds;
- char model_precache[MAX_MODELS][MAX_QPATH];
- char sound_precache[MAX_SOUNDS][MAX_QPATH];
entity_t *ent;
Con_DPrintf ("Serverinfo packet received.\n");
Host_Error ("Server sent too many model precaches\n");
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
- strcpy (model_precache[nummodels], str);
+ strcpy (parse_model_precache[nummodels], str);
Mod_TouchModel (str);
}
Host_Error ("Server sent too many sound precaches\n");
if (strlen(str) >= MAX_QPATH)
Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
- strcpy (sound_precache[numsounds], str);
+ strcpy (parse_sound_precache[numsounds], str);
S_TouchSound (str);
}
// world model
CL_KeepaliveMessage ();
- cl.model_precache[1] = Mod_ForName (model_precache[1], false, false, true);
+ cl.model_precache[1] = Mod_ForName (parse_model_precache[1], false, false, true);
if (cl.model_precache[1] == NULL)
- Con_Printf("Map %s not found\n", model_precache[1]);
+ Con_Printf("Map %s not found\n", parse_model_precache[1]);
// normal models
for (i=2 ; i<nummodels ; i++)
{
CL_KeepaliveMessage ();
- if ((cl.model_precache[i] = Mod_ForName (model_precache[i], false, false, false)) == NULL)
- Con_Printf("Model %s not found\n", model_precache[i]);
+ if ((cl.model_precache[i] = Mod_ForName (parse_model_precache[i], false, false, false)) == NULL)
+ Con_Printf("Model %s not found\n", parse_model_precache[i]);
}
// sounds
for (i=1 ; i<numsounds ; i++)
{
CL_KeepaliveMessage ();
- cl.sound_precache[i] = S_PrecacheSound (sound_precache[i], true);
+ cl.sound_precache[i] = S_PrecacheSound (parse_sound_precache[i], true);
}
S_EndPrecaching ();
// entire entity array was cleared, so just fill in a few fields
ent->state_current.active = true;
ent->render.model = cl.worldmodel = cl.model_precache[1];
- ent->render.scale = 1;
+ //ent->render.scale = 1;
ent->render.alpha = 1;
+ Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1);
+ Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
CL_BoundingBoxForEntity(&ent->render);
// clear entlife array
memset(entlife, 0, MAX_EDICTS);
VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
VectorCopy(ent->state_current.angles, ent->persistent.newangles);
}
- else// if (ent->state_current.flags & RENDER_STEP)
+ else if (ent->state_current.flags & RENDER_STEP)
{
// monster interpolation
if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01)
VectorCopy(ent->state_current.angles, ent->persistent.newangles);
}
}
- /*
else
{
// not a monster
ent->persistent.lerpstarttime = cl.mtime[1];
// no lerp if it's singleplayer
- //if (sv.active && svs.maxclients == 1 && !ent->state_current.flags & RENDER_STEP)
- // ent->persistent.lerpdeltatime = 0;
- //else
+ if (sv.active && svs.maxclients == 1 && !ent->state_current.flags & RENDER_STEP)
+ ent->persistent.lerpdeltatime = 0;
+ else
ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1];
VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin);
VectorCopy(ent->persistent.newangles, ent->persistent.oldangles);
VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
VectorCopy(ent->state_current.angles, ent->persistent.newangles);
}
- */
}
/*
}
}
+static entity_frame_t entityframe;
void CL_ReadEntityFrame(void)
{
entity_t *ent;
- entity_frame_t entityframe;
int i;
EntityFrame_Read(&cl.entitydatabase);
EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe);
ent->render.skinnum = ent->state_baseline.skin;
ent->render.effects = ent->state_baseline.effects;
ent->render.alpha = 1;
- ent->render.scale = 1;
- ent->render.alpha = 1;
+ //ent->render.scale = 1;
- VectorCopy (ent->state_baseline.origin, ent->render.origin);
- VectorCopy (ent->state_baseline.angles, ent->render.angles);
+ //VectorCopy (ent->state_baseline.origin, ent->render.origin);
+ //VectorCopy (ent->state_baseline.angles, ent->render.angles);
+ Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1);
+ Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
CL_BoundingBoxForEntity(&ent->render);
// This is definitely cheating...
cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav", false);
}
-void CL_ParseBeam (model_t *m)
+void CL_ParseBeam (model_t *m, int lightning)
{
int i, ent;
vec3_t start, end;
MSG_ReadVector(start);
MSG_ReadVector(end);
+ if (ent >= MAX_EDICTS)
+ {
+ Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent);
+ ent = 0;
+ }
+
// override any beam with the same entity
for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
{
if (b->entity == ent)
{
//b->entity = ent;
+ b->lightning = lightning;
+ b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0;
b->model = m;
b->endtime = cl.time + 0.2;
VectorCopy (start, b->start);
if (!b->model || b->endtime < cl.time)
{
b->entity = ent;
+ b->lightning = lightning;
+ b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0;
b->model = m;
b->endtime = cl.time + 0.2;
VectorCopy (start, b->start);
case TE_WIZSPIKE:
// spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ CL_AllocDlight (NULL, pos, 50, 0.25f, 1.00f, 0.25f, 250, 0.2);
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);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
+ CL_AllocDlight (NULL, pos, 50, 1.0f, 0.60f, 0.20f, 250, 0.2);
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);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
// LordHavoc: changed to spark shower
CL_SparkShower(pos, vec3_origin, 15);
if ( rand() % 5 )
case TE_SPIKEQUAD:
// quad spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
// LordHavoc: changed to spark shower
CL_SparkShower(pos, vec3_origin, 15);
CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
case TE_SUPERSPIKE:
// super spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
// LordHavoc: changed to dust shower
CL_SparkShower(pos, vec3_origin, 30);
if ( rand() % 5 )
case TE_SUPERSPIKEQUAD:
// quad super spike hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
// LordHavoc: changed to dust shower
CL_SparkShower(pos, vec3_origin, 30);
CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2);
case TE_BLOOD:
// blood puff
MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
dir[0] = MSG_ReadChar ();
dir[1] = MSG_ReadChar ();
dir[2] = MSG_ReadChar ();
case TE_BLOOD2:
// blood puff
MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
CL_BloodPuff(pos, vec3_origin, 10);
break;
case TE_SPARK:
// spark shower
MSG_ReadVector(pos);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
dir[0] = MSG_ReadChar ();
dir[1] = MSG_ReadChar ();
dir[2] = MSG_ReadChar ();
count = MSG_ReadByte ();
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
CL_SparkShower(pos, dir, count);
break;
case TE_PLASMABURN:
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
CL_PlasmaBurn(pos);
break;
case TE_GUNSHOT:
// bullet hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
// LordHavoc: changed to dust shower
CL_SparkShower(pos, vec3_origin, 15);
break;
case TE_GUNSHOTQUAD:
// quad bullet hitting wall
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
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);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
CL_ParticleExplosion (pos);
// 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);
case TE_EXPLOSIONQUAD:
// quad rocket explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
CL_ParticleExplosion (pos);
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);
case TE_EXPLOSION3:
// Nehahra movie colored lighting explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
CL_ParticleExplosion (pos);
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);
case TE_EXPLOSIONRGB:
// colored lighting explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
CL_ParticleExplosion (pos);
color[0] = MSG_ReadByte() * (1.0 / 255.0);
color[1] = MSG_ReadByte() * (1.0 / 255.0);
case TE_TAREXPLOSION:
// tarbaby explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
CL_BlobExplosion (pos);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
case TE_SMALLFLASH:
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2);
break;
case TE_CUSTOMFLASH:
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
radius = MSG_ReadByte() * 8;
velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0);
color[0] = MSG_ReadByte() * (1.0 / 255.0);
// lightning bolts
if (!cl_model_bolt)
cl_model_bolt = Mod_ForName("progs/bolt.mdl", true, false, false);
- CL_ParseBeam (cl_model_bolt);
+ CL_ParseBeam (cl_model_bolt, true);
break;
case TE_LIGHTNING2:
// lightning bolts
if (!cl_model_bolt2)
cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", true, false, false);
- CL_ParseBeam (cl_model_bolt2);
+ CL_ParseBeam (cl_model_bolt2, true);
break;
case TE_LIGHTNING3:
// lightning bolts
if (!cl_model_bolt3)
cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, false, false);
- CL_ParseBeam (cl_model_bolt3);
+ CL_ParseBeam (cl_model_bolt3, false);
break;
// PGM 01/21/97
// grappling hook beam
if (!cl_model_beam)
cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false);
- CL_ParseBeam (cl_model_beam);
+ CL_ParseBeam (cl_model_beam, false);
break;
// PGM 01/21/97
// LordHavoc: for compatibility with the Nehahra movie...
case TE_LIGHTNING4NEH:
- CL_ParseBeam (Mod_ForName(MSG_ReadString(), true, false, false));
+ CL_ParseBeam (Mod_ForName(MSG_ReadString(), true, false, false), false);
break;
case TE_LAVASPLASH:
pos[0] = MSG_ReadCoord ();
pos[1] = MSG_ReadCoord ();
pos[2] = MSG_ReadCoord ();
- CL_AllocDlight (NULL, pos, 1000, 1.25f, 1.25f, 1.25f, 3000, 99.0f);
+ CL_AllocDlight (NULL, pos, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f);
// CL_TeleportSplash (pos);
break;
case TE_EXPLOSION2:
// color mapped explosion
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
colorStart = MSG_ReadByte ();
colorLength = MSG_ReadByte ();
CL_ParticleExplosion2 (pos, colorStart, colorLength);
MSG_ReadVector(pos);
MSG_ReadVector(dir);
count = MSG_ReadByte ();
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4);
CL_Tei_Smoke(pos, dir, count);
break;
case TE_TEI_BIGEXPLOSION:
MSG_ReadVector(pos);
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10);
CL_ParticleExplosion (pos);
CL_AllocDlight (NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999);
S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1);
MSG_ReadVector(pos);
MSG_ReadVector(dir);
count = MSG_ReadByte ();
- Mod_FindNonSolidLocation(pos, cl.worldmodel);
+ Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 5);
CL_Tei_PlasmaHit(pos, dir, count);
CL_AllocDlight (NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999);
break;
if (i >= cl.maxclients)
Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients");
cl.scores[i].colors = MSG_ReadByte ();
- // update our color cvar if our color changed
- if (i == cl.playerentity - 1)
- Cvar_SetValue ("_cl_color", cl.scores[i].colors);
break;
case svc_particle:
projects / xonotic / darkplaces.git / blobdiff