fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix some tenebrae-style rtlights.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4637 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-04-12 03:30:27 +00:00
parent f25a6cd758
commit 5be72a87b8
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
engine/client/cl_ents.c
View file

@ -1602,7 +1602,7 @@ void CL_RotateAroundTag(entity_t *ent, int entnum, int parenttagent, int parentt
int model; int model;
framestate_t fstate; framestate_t fstate;
if (parenttagent > cl.maxlerpents) if (parenttagent >= cl.maxlerpents)
{ {
Con_Printf("tag entity out of range!\n"); Con_Printf("tag entity out of range!\n");
return; return;
@ -2881,7 +2881,7 @@ static void CL_TransitionPacketEntities(int newsequence, packet_entities_t *newp
#ifdef RAGDOLL #ifdef RAGDOLL
le = &cl.lerpents[sold->number]; le = &cl.lerpents[sold->number];
if (le->skeletalobject) if (sold->number < cl.maxlerpents && le->skeletalobject)
rag_removedeltaent(le); rag_removedeltaent(le);
#endif #endif
} }
@ -3344,7 +3344,7 @@ void CL_LinkPacketEntities (void)
colour[2] = state->light[2]/1024.0f; colour[2] = state->light[2]/1024.0f;
} }
dl = CL_NewDlight(state->number, ent->origin, state->light[3]?state->light[3]:350, 0.1, colour[0], colour[1], colour[2]); dl = CL_NewDlight(state->number, ent->origin, state->light[3]?state->light[3]:350, 0.1, colour[0], colour[1], colour[2]);
if (!(dl->flags & PFLAGS_FULLDYNAMIC)) //corona-only lights shouldn't do much else. if (!(state->lightpflags & PFLAGS_FULLDYNAMIC)) //corona-only lights shouldn't do much else.
{ {
dl->flags &= ~(LFLAG_LIGHTMAP|LFLAG_FLASHBLEND); dl->flags &= ~(LFLAG_LIGHTMAP|LFLAG_FLASHBLEND);
#ifdef RTLIGHTS #ifdef RTLIGHTS
@ -3599,15 +3599,16 @@ void CL_LinkPacketEntities (void)
else if (modelflags & MFH2_ACIDBALL) else if (modelflags & MFH2_ACIDBALL)
{ {
rad = 120 - (r_lightflicker.value?(rand() % 20):10); rad = 120 - (r_lightflicker.value?(rand() % 20):10);
dclr[0] = 0.1; dclr[0] = 0.5;
dclr[1] = 0.2; dclr[1] = 1;
dclr[2] = 0.25;
} }
else if (modelflags & MFH2_SPIT) else if (modelflags & MFH2_SPIT)
{ {
// as far as I can tell this effect inverses the light... // as far as I can tell this effect inverses the light...
dclr[0] = -dclr[0]; dclr[0] = -dclr[0];
dclr[0] = -dclr[1]; dclr[1] = -dclr[1];
dclr[0] = -dclr[2]; dclr[2] = -dclr[2];
rad = 120 - (r_lightflicker.value?(rand() % 20):10); rad = 120 - (r_lightflicker.value?(rand() % 20):10);
} }