From b66433478c1966d35acd294a6f62108fbd408e8d Mon Sep 17 00:00:00 2001 From: UnizoneDev Date: Fri, 11 Nov 2022 15:24:49 -0600 Subject: [PATCH] Simplify sliding objects for now --- src/namedef_custom.h | 1 - src/playsim/p_map.cpp | 12 +----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/namedef_custom.h b/src/namedef_custom.h index 77270b89b40..16f6a022a75 100644 --- 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 index a4693461fa2..cbb62cfa1af 100644 --- 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) &&