zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-09 01:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify sliding objects for now

Browse source
This commit is contained in:
UnizoneDev 2022-11-11 15:24:49 -06:00 committed by Christoph Oelckers
parent 9af664d117
commit b66433478c
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/namedef_custom.h
View file

@ -349,7 +349,6 @@ xx(GenericFreezeDeath)
xx(GenericCrush) xx(GenericCrush)
xx(DieFromSpawn) xx(DieFromSpawn)
xx(Slam) xx(Slam)
xx(Slide)
// Bounce state names // Bounce state names
xx(Bounce) xx(Bounce)

12
src/playsim/p_map.cpp
View file

@ -1684,19 +1684,9 @@ bool PIT_CheckThing(FMultiBlockThingsIterator &it, FMultiBlockThingsIterator::Ch
{ // Push thing { // Push thing
if (thing->lastpush != tm.PushTime) if (thing->lastpush != tm.PushTime)
{ {
thing->PlayPushSound();
thing->Vel += tm.thing->Vel.XY() * thing->pushfactor; thing->Vel += tm.thing->Vel.XY() * thing->pushfactor;
thing->lastpush = tm.PushTime; 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) && solid = (thing->flags & MF_SOLID) &&