Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Heretic: Improve Translucency of firing Mummyleaders #1260

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions src/heretic/p_enemy.c
Original file line number Diff line number Diff line change
Expand Up @@ -626,11 +626,6 @@ void A_Look(mobj_t *actor, player_t *player, pspdef_t *psp)
else
goto seeyou;
}
// [crispy] Undo Mummyleader translucency
if (actor->type == MT_MUMMYLEADER)
{
actor->flags &= ~MF_TRANSLUCENT;
}

if (!P_LookForPlayers(actor, false))
return;
Expand Down Expand Up @@ -705,11 +700,6 @@ void A_Chase(mobj_t *actor, player_t *player, pspdef_t *psp)
actor->tics = 3;
}
}
// [crispy] Undo Mummyleader translucency
if (actor->type == MT_MUMMYLEADER)
{
actor->flags &= ~MF_TRANSLUCENT;
}

//
// turn towards movement direction if not there yet
Expand Down Expand Up @@ -831,11 +821,6 @@ void A_FaceTarget(mobj_t *actor, player_t *player, pspdef_t *psp)
{ // Target is a ghost
actor->angle += P_SubRandom() << 21;
}
// [crispy] Charging-up Mummyleaders are translucent in that state (blinking)
if (actor->type == MT_MUMMYLEADER)
{
actor->flags |= MF_TRANSLUCENT;
}
}

//----------------------------------------------------------------------------
Expand Down
4 changes: 0 additions & 4 deletions src/heretic/p_inter.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,10 +980,6 @@ void P_KillMobj(mobj_t * source, mobj_t * target)
if (target->type == MT_POD)
target->flags |= MF_TRANSLUCENT;

// [crispy] Undo Mummyleader translucency
if (target->type == MT_MUMMYLEADER)
target->flags &= ~MF_TRANSLUCENT;

if (target->health < -(target->info->spawnhealth >> 1)
&& target->info->xdeathstate)
{ // Extreme death
Expand Down
17 changes: 17 additions & 0 deletions src/heretic/r_things.c
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,24 @@ void R_AddSprites(sector_t * sec)


for (thing = sec->thinglist; thing; thing = thing->snext)
{
// [crispy] draw base frame and translucent current frame for mummyleader attack
if (crispy->translucency & TRANSLUCENCY_MISSILE)
{
if (thing->info->doomednum == 45 && thing->frame == 32792)
{
thing->frame = 23; // [crispy] set attack stance without fire edging
R_ProjectSprite(thing);
thing->frame = 32792; // [crispy] restore Attack with fire edging
thing->flags |= MF_TRANSLUCENT;
}
}
R_ProjectSprite(thing);
if (thing->info->doomednum == 45 && thing->flags & MF_TRANSLUCENT)
{
thing->flags &= ~MF_TRANSLUCENT;
}
}
}


Expand Down
Loading