Correct some extant fuckups.
This commit is contained in:
parent
323d5d61d3
commit
b3e953c8c3
|
@ -1170,7 +1170,7 @@ void HWR_DL_AddLight(gr_vissprite_t *spr, GLPatch_t *patch)
|
||||||
if (!(p_lspr->type & DYNLIGHT_SPR))
|
if (!(p_lspr->type & DYNLIGHT_SPR))
|
||||||
return;
|
return;
|
||||||
if ((p_lspr->type != LIGHT_SPR) || cv_grstaticlighting.value)
|
if ((p_lspr->type != LIGHT_SPR) || cv_grstaticlighting.value)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
LIGHT_POS(dynlights->nb).x = FIXED_TO_FLOAT(spr->mobj->x);
|
LIGHT_POS(dynlights->nb).x = FIXED_TO_FLOAT(spr->mobj->x);
|
||||||
LIGHT_POS(dynlights->nb).y = FIXED_TO_FLOAT(spr->mobj->z)+FIXED_TO_FLOAT(spr->mobj->height>>1)+p_lspr->light_yoffset;
|
LIGHT_POS(dynlights->nb).y = FIXED_TO_FLOAT(spr->mobj->z)+FIXED_TO_FLOAT(spr->mobj->height>>1)+p_lspr->light_yoffset;
|
||||||
|
|
16
src/p_tick.c
16
src/p_tick.c
|
@ -230,13 +230,19 @@ void P_RemoveThinkerDelayed(thinker_t *thinker)
|
||||||
{
|
{
|
||||||
thinker_t *next;
|
thinker_t *next;
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
if (thinker->next)
|
#define BEENAROUNDBIT (0x40000000) // has to be sufficiently high that it's unlikely to happen in regular gameplay. If you change this, pay attention to the bit pattern of INT32_MIN.
|
||||||
thinker->next = NULL;
|
if (thinker->references & ~BEENAROUNDBIT)
|
||||||
else if (thinker->references) // Usually gets cleared up in one frame; what's going on here, then?
|
{
|
||||||
CONS_Printf("Number of potentially faulty references: %d\n", thinker->references);
|
if (thinker->references & BEENAROUNDBIT) // Usually gets cleared up in one frame; what's going on here, then?
|
||||||
#endif
|
CONS_Printf("Number of potentially faulty references: %d\n", (thinker->references & ~BEENAROUNDBIT));
|
||||||
|
thinker->references |= BEENAROUNDBIT;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#undef BEENAROUNDBIT
|
||||||
|
#else
|
||||||
if (thinker->references)
|
if (thinker->references)
|
||||||
return;
|
return;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Remove from main thinker list */
|
/* Remove from main thinker list */
|
||||||
next = thinker->next;
|
next = thinker->next;
|
||||||
|
|
Loading…
Reference in New Issue