Simplify sliding objects for now

ZDoom · Nov 13, 2022 · b664334 · b664334
1 parent 9af664d
commit b664334
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
@@ -349,7 +349,6 @@ xx(GenericFreezeDeath)
 xx(GenericCrush)
 xx(DieFromSpawn)
 xx(Slam)
-xx(Slide)
 
 // Bounce state names
 xx(Bounce)

diff --git a/src/playsim/p_map.cpp b/src/playsim/p_map.cpp
@@ -1684,19 +1684,9 @@ bool PIT_CheckThing(FMultiBlockThingsIterator &it, FMultiBlockThingsIterator::Ch
 	{ // Push thing
 		if (thing->lastpush != tm.PushTime)
 		{
+			thing->PlayPushSound();
 			thing->Vel += tm.thing->Vel.XY() * thing->pushfactor;
 			thing->lastpush = tm.PushTime;
-
-			FState* push = thing->FindState(NAME_Slide);
-			if (push != NULL)
-			{
-				thing->SetState(push);
-				thing->PlayPushSound();
-			}
-			else
-			{
-				thing->SetIdle();
-			}
 		}
 	}
 	solid = (thing->flags & MF_SOLID) &&