mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-25 13:41:05 +00:00
- added handling for MF5_NOINTERACTION to A_Weave.
SVN r3507 (trunk)
This commit is contained in:
parent
92a8f8518c
commit
3e7473e51a
1 changed files with 12 additions and 1 deletions
|
@ -3785,7 +3785,18 @@ void A_Weave(AActor *self, int xyspeed, int zspeed, fixed_t xydist, fixed_t zdis
|
|||
dist = FixedMul(FloatBobOffsets[weaveXY], xydist);
|
||||
newX += FixedMul (finecosine[angle], dist);
|
||||
newY += FixedMul (finesine[angle], dist);
|
||||
P_TryMove (self, newX, newY, true);
|
||||
if (!(self->flags5 & MF5_NOINTERACTION))
|
||||
{
|
||||
P_TryMove (self, newX, newY, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
self->UnlinkFromWorld ();
|
||||
self->flags |= MF_NOBLOCKMAP;
|
||||
self->x = newX;
|
||||
self->y = newY;
|
||||
self->LinkToWorld ();
|
||||
}
|
||||
self->WeaveIndexXY = weaveXY;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue