Minor tweaks

bradharding · Jan 18, 2025 · 8b97da5 · 8b97da5
1 parent 08e3323
commit 8b97da5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/p_floor.c b/src/p_floor.c
@@ -590,8 +590,6 @@ void P_CheckTerrainType(sector_t *sector)
 
                 if (!(thing->flags & MF_SPAWNCEILING) && (thing->flags2 & MF2_FOOTCLIP))
                     thing->flags2 |= MF2_FEETARECLIPPED;
-                else
-                    thing->flags2 &= ~MF2_FEETARECLIPPED;
             }
         }
         else

diff --git a/src/p_map.c b/src/p_map.c
@@ -1009,7 +1009,7 @@ bool P_IsInLiquid(mobj_t *thing)
     if (!thing->player && thing->z > highestsector->floorheight + 2 * FRACUNIT)
         return false;
 
-    return (highestsector->terraintype >= LIQUID);
+    return (highestsector->terraintype >= LIQUID && !(thing->flags & MF_SPAWNCEILING));
 }
 
 //

diff --git a/src/p_mobj.c b/src/p_mobj.c
@@ -826,7 +826,7 @@ mobj_t *P_SpawnMobj(const fixed_t x, const fixed_t y, const fixed_t z, const mob
         mobj->height = info->height;
         mobj->z = mobj->oldz = mobj->floorz;
 
-        if ((mobj->flags2 & MF2_FOOTCLIP) && !sector->heightsec && P_IsInLiquid(mobj))
+        if ((mobj->flags2 & MF2_FOOTCLIP) && P_IsInLiquid(mobj))
             mobj->flags2 |= MF2_FEETARECLIPPED;
     }
     else if (z == ONCEILINGZ)
-Original file line number
+Diff line change
@@ Expand Up / @@ -590,8 +590,6 @@ void P_CheckTerrainType(sector_t *sector) @@
                     if (!(thing->flags & MF_SPAWNCEILING) && (thing->flags2 & MF2_FOOTCLIP))
                         thing->flags2 |= MF2_FEETARECLIPPED;
-                    else
-                        thing->flags2 &= ~MF2_FEETARECLIPPED;
                 }
             }
             else
@@ Expand Down @@