Fix spawning of blood splats if blood is dehacked

Fixes #848.
bradharding · Nov 28, 2024 · 784f9e2 · 784f9e2
1 parent 0d6866b
commit 784f9e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/p_mobj.c b/src/p_mobj.c
@@ -465,7 +465,8 @@ static void P_ZMovement(mobj_t *mo)
     if (mo->z <= floorz)
     {
         // [BH] remove blood the moment it hits the ground and spawn blood splats in its place
-        if (mo->type == MT_BLOOD || (SD21 && mo->sprite == 383))
+        if ((mo->type == MT_BLOOD && states[S_BLOOD3].nextstate == S_NULL)
+            || (SD21 && mo->sprite == 383))
         {
             P_RemoveBloodMobj(mo);
 

diff --git a/src/states.c b/src/states.c
@@ -235,7 +235,7 @@ state_t original_states[] =
     // Blood (MT_BLOOD)
     { SPR_BLUD,    2,                     8, NULL,                   S_BLOOD2            }, // S_BLOOD1
     { SPR_BLUD,    1,                     8, NULL,                   S_BLOOD3            }, // S_BLOOD2
-    { SPR_BLUD,    0,                    -1, NULL,                   S_NULL              }, // S_BLOOD3
+    { SPR_BLUD,    0,                     8, NULL,                   S_NULL              }, // S_BLOOD3
 
     // Bullet Puff (MT_PUFF)
     { SPR_PUFF,    FF_FULLBRIGHT,         4, NULL,                   S_PUFF2             }, // S_PUFF1