qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-10 14:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

holy water has been sprinkled on the dancing corpses. they dance no more

Browse source 
also a little whitespace
This commit is contained in:
Bill Currie 2000-12-12 06:17:02 +00:00
parent 0c662b0e6a
commit c765120903
3 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
source/cl_ents.c
View file

@ -483,15 +483,25 @@ CL_LinkPacketEntities (void)
// spawn light flashes, even ones coming from invisible objects // spawn light flashes, even ones coming from invisible objects
if ((s1->effects & (EF_BLUE | EF_RED)) == (EF_BLUE | EF_RED)) if ((s1->effects & (EF_BLUE | EF_RED)) == (EF_BLUE | EF_RED))
CL_NewDlight (s1->number, s1->origin[0], s1->origin[1], s1->origin[2], 200 + (rand () & 31), 0.1, 3); CL_NewDlight (s1->number,
s1->origin[0], s1->origin[1], s1->origin[2],
200 + (rand () & 31), 0.1, 3);
else if (s1->effects & EF_BLUE) else if (s1->effects & EF_BLUE)
CL_NewDlight (s1->number, s1->origin[0], s1->origin[1], s1->origin[2], 200 + (rand () & 31), 0.1, 1); CL_NewDlight (s1->number,
s1->origin[0], s1->origin[1], s1->origin[2],
200 + (rand () & 31), 0.1, 1);
else if (s1->effects & EF_RED) else if (s1->effects & EF_RED)
CL_NewDlight (s1->number, s1->origin[0], s1->origin[1], s1->origin[2], 200 + (rand () & 31), 0.1, 2); CL_NewDlight (s1->number,
s1->origin[0], s1->origin[1], s1->origin[2],
200 + (rand () & 31), 0.1, 2);
else if (s1->effects & EF_BRIGHTLIGHT) else if (s1->effects & EF_BRIGHTLIGHT)
CL_NewDlight (s1->number, s1->origin[0], s1->origin[1], s1->origin[2] + 16, 400 + (rand () & 31), 0.1, 0); CL_NewDlight (s1->number,
s1->origin[0], s1->origin[1], s1->origin[2] + 16,
400 + (rand () & 31), 0.1, 0);
else if (s1->effects & EF_DIMLIGHT) else if (s1->effects & EF_DIMLIGHT)
CL_NewDlight (s1->number, s1->origin[0], s1->origin[1], s1->origin[2], 200 + (rand () & 31), 0.1, 0); CL_NewDlight (s1->number,
s1->origin[0], s1->origin[1], s1->origin[2],
200 + (rand () & 31), 0.1, 0);
// if set to invisible, skip // if set to invisible, skip
if (!s1->modelindex) if (!s1->modelindex)
@ -573,10 +583,6 @@ CL_LinkPacketEntities (void)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
ent->origin[i] = s2->origin[i] + f * (s1->origin[i] - s2->origin[i]); ent->origin[i] = s2->origin[i] + f * (s1->origin[i] - s2->origin[i]);
// add automatic particle trails
if (!model->flags)
continue;
// scan the old entity display list for a matching // scan the old entity display list for a matching
for (i = 0; i < cl_oldnumvisedicts; i++) { for (i = 0; i < cl_oldnumvisedicts; i++) {
if (cl_oldvisedicts[i].keynum == ent->keynum) { if (cl_oldvisedicts[i].keynum == ent->keynum) {
@ -589,7 +595,14 @@ CL_LinkPacketEntities (void)
} }
} }
if (i == cl_oldnumvisedicts) // not in last message if (i == cl_oldnumvisedicts) {
// not in last message
ent->pose1 = ent->pose2 = -1; // don't lerp
continue;
}
// add automatic particle trails
if (!model->flags)
continue; continue;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)

4
source/gl_rmain.c
View file

@ -668,7 +668,11 @@ R_SetupAliasBlendedFrame (int frame, aliashdr_t *paliashdr, entity_t *e, qboolea
if (e->pose2 != pose) { if (e->pose2 != pose) {
e->frame_start_time = realtime; e->frame_start_time = realtime;
if (e->pose2 == -1) {
e->pose1 = pose;
} else {
e->pose1 = e->pose2; e->pose1 = e->pose2;
}
e->pose2 = pose; e->pose2 = pose;
blend = 0; blend = 0;
} else { } else {