Skip to content

Commit

Permalink
entirely remove all "blood fixes" from the colored blood feature
Browse files Browse the repository at this point in the history
That is, spectres don't bleed spectre blood anymore and Lost Souls
don't bleed puffs anymore, plus one or two other Vanilla deviations.

Fixes #736
  • Loading branch information
fabiangreffrath committed Aug 30, 2021
1 parent b51db30 commit 99ca747
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 24 deletions.
4 changes: 0 additions & 4 deletions src/doom/p_enemy.c
Expand Up @@ -1565,10 +1565,6 @@ A_PainShootSkull
return;
}

// [crispy] Lost Souls bleed Puffs
if (crispy->coloredblood)
newmobj->flags |= MF_NOBLOOD;

newmobj->target = actor->target;
A_SkullAttack (newmobj);
}
Expand Down
13 changes: 1 addition & 12 deletions src/doom/p_map.c
Expand Up @@ -1529,12 +1529,6 @@ boolean PIT_ChangeSector (mobj_t* thing)
{
P_SetMobjState (thing, S_GIBS);

// [crispy] no blood, no giblets
if (crispy->coloredblood && (thing->flags & MF_NOBLOOD))
{
thing->sprite = SPR_TNT1;
}

if (gameversion > exe_doom_1_2)
thing->flags &= ~MF_SOLID;
thing->height = 0;
Expand Down Expand Up @@ -1571,18 +1565,13 @@ boolean PIT_ChangeSector (mobj_t* thing)
// spray blood in a random direction
mo = P_SpawnMobj (thing->x,
thing->y,
// [crispy] Lost Souls and Barrels bleed Puffs
thing->z + thing->height/2, (thing->flags & MF_NOBLOOD) ? MT_PUFF : MT_BLOOD);
thing->z + thing->height/2, MT_BLOOD);

mo->momx = P_SubRandom() << 12;
mo->momy = P_SubRandom() << 12;

// [crispy] connect blood object with the monster that bleeds it
mo->target = thing;

// [crispy] Spectres bleed spectre blood
if (crispy->coloredblood)
mo->flags |= (thing->flags & MF_SHADOW);
}

// keep checking (crush other things)
Expand Down
8 changes: 0 additions & 8 deletions src/doom/p_mobj.c
Expand Up @@ -1052,10 +1052,6 @@ void P_SpawnMapThing (mapthing_t* mthing)
mobj->health = 1000 + musid;
}

// [crispy] Lost Souls bleed Puffs
if (crispy->coloredblood && i == MT_SKULL)
mobj->flags |= MF_NOBLOOD;

// [crispy] randomly colorize space marine corpse objects
if (!netgame && crispy->coloredblood &&
(mobj->info->spawnstate == S_PLAY_DIE7 ||
Expand Down Expand Up @@ -1149,10 +1145,6 @@ P_SpawnBlood

// [crispy] connect blood object with the monster that bleeds it
th->target = target;

// [crispy] Spectres bleed spectre blood
if (crispy->coloredblood)
th->flags |= (target->flags & MF_SHADOW);
}


Expand Down

0 comments on commit 99ca747

Please sign in to comment.