Don't perform fake movement for P_Move() checks

MrAlaux · Nov 26, 2023 · 8eb4afb · 8eb4afb
1 parent 1e60f24
commit 8eb4afb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/p_enemy.c b/src/p_enemy.c
@@ -414,15 +414,15 @@ static boolean P_Move(mobj_t *actor, boolean dropoff) // killough 9/12/98
               actor->z += FLOATSPEED;
 
               // [Nugget]
-              if ((onmo = P_CheckOnmobj(actor)))
+              if ((onmo = P_CheckOnmobj(actor, false)))
               { actor->z = onmo->z - actor->height; }
           }
           else
           {
             actor->z -= FLOATSPEED;
 
             // [Nugget]
-            if ((onmo = P_CheckOnmobj(actor)))
+            if ((onmo = P_CheckOnmobj(actor, false)))
             { actor->z = onmo->z + onmo->height; }
           }
 

diff --git a/src/p_map.c b/src/p_map.c
@@ -2544,7 +2544,7 @@ static void P_FakeZMovement(mobj_t *mo)
 }
 
 // Checks if the new Z position is legal
-mobj_t *P_CheckOnmobj(mobj_t *thing)
+mobj_t *P_CheckOnmobj(mobj_t *thing, boolean fakemove)
 {
   int xl, xh, yl, yh, bx, by;
   subsector_t *newsubsec;
@@ -2584,7 +2584,7 @@ mobj_t *P_CheckOnmobj(mobj_t *thing)
   yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS) >> MAPBLOCKSHIFT;
   yh = (tmbbox[BOXTOP]    - bmaporgy + MAXRADIUS) >> MAPBLOCKSHIFT;
 
-  P_FakeZMovement(tmthing);
+  if (fakemove) { P_FakeZMovement(tmthing); }
 
   for (bx = xl; bx <= xh; bx++)
     for (by = yl; by <= yh; by++)

diff --git a/src/p_map.h b/src/p_map.h
@@ -78,7 +78,7 @@ extern msecnode_t *sector_list;                             // phares 3/16/98
 extern fixed_t tmbbox[4];         // phares 3/20/98
 extern line_t *blockline;   // killough 8/11/98
 
-mobj_t *P_CheckOnmobj(mobj_t *thing); // [Nugget]: [DSDA]
+mobj_t *P_CheckOnmobj(mobj_t *thing, boolean fakemove); // [Nugget]: [DSDA]
 
 extern boolean boomshot; // [Nugget] Explosive hitscan cheat
 

diff --git a/src/p_mobj.c b/src/p_mobj.c
@@ -794,7 +794,7 @@ void P_MobjThinker (mobj_t* mobj)
       {
         mobj_t *onmo;
 
-        if (!(onmo = P_CheckOnmobj(mobj)))
+        if (!(onmo = P_CheckOnmobj(mobj, true)))
         {
           P_ZMovement(mobj);
           mobj->intflags &= ~MIF_ONMOBJ;