stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-19 18:41:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up comments

Browse source
This commit is contained in:
MIDIMan 2024-03-01 13:09:25 -05:00
parent 17e7aea311
commit d18a4cca1e
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.c
View file

@ -10493,6 +10493,7 @@ void P_MobjThinker(mobj_t *mobj)
case MT_GRENADEPICKUP: case MT_GRENADEPICKUP:
if (mobj->health == 0) // Fading tile if (mobj->health == 0) // Fading tile
{ {
// TODO: Maybe use mobj->alpha instead of messing with frame flags
INT32 value = mobj->info->damage/10; INT32 value = mobj->info->damage/10;
value = mobj->fuse/value; value = mobj->fuse/value;
value = 10-value; value = 10-value;
@ -10503,9 +10504,6 @@ void P_MobjThinker(mobj_t *mobj)
mobj->frame &= ~FF_TRANSMASK; mobj->frame &= ~FF_TRANSMASK;
mobj->frame |= value << FF_TRANSSHIFT; mobj->frame |= value << FF_TRANSSHIFT;
// TODO: Consider replacing the above with the commented-out line of code below
//mobj->alpha = FixedDiv(mobj->fuse, mobj->info->damage);
} }
break; break;
default: default:

4
src/r_things.c
View file

@ -3428,10 +3428,8 @@ boolean R_ThingVisible (mobj_t *thing)
(thing->sprite == SPR_NULL) || // Don't draw null-sprites (thing->sprite == SPR_NULL) || // Don't draw null-sprites
(thing->flags2 & MF2_DONTDRAW) || // Don't draw MF2_LINKDRAW objects (thing->flags2 & MF2_DONTDRAW) || // Don't draw MF2_LINKDRAW objects
(thing->drawonlyforplayer && thing->drawonlyforplayer != viewplayer) || // Don't draw other players' personal objects (thing->drawonlyforplayer && thing->drawonlyforplayer != viewplayer) || // Don't draw other players' personal objects
//(thing->alpha == 0) || // Don't draw objects with an alpha of 0
((rendermode == render_soft && R_GetTransmapFromAlpha(thing->alpha, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT) >= 10) || ((rendermode == render_soft && R_GetTransmapFromAlpha(thing->alpha, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT) >= 10) ||
(rendermode == render_opengl && thing->alpha == 0)) || // TODO: Maybe rethink this (rendermode == render_opengl && thing->alpha == 0)) ||
//(rendermode == render_soft && R_GetTransmapFromAlpha(thing->alpha, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT) >= 10) ||
(!P_MobjWasRemoved(r_viewmobj) && ( (!P_MobjWasRemoved(r_viewmobj) && (
(r_viewmobj == thing) || // Don't draw first-person players or awayviewmobj objects (r_viewmobj == thing) || // Don't draw first-person players or awayviewmobj objects
(r_viewmobj->player && r_viewmobj->player->followmobj == thing) || // Don't draw first-person players' followmobj (r_viewmobj->player && r_viewmobj->player->followmobj == thing) || // Don't draw first-person players' followmobj